[ros-diffs] [cgutman] 53062: - Revert r52573 - Branch repair (part 1 of x)