[ros-diffs] [cgutman] 40230: - Revert an unwanted change