[ros-diffs] [cgutman] 41775: - Revert r41761