[ros-diffs] [cgutman] 36104: - Revert 36093