Previously it would set it as the first one only to be immediately pushed a place down to second. (cherry picked from commit b0129e27)