[ros-diffs] [cgutman] 36883: - Revert an unintended change