Fix bad rebaselining from cross-branch fixes