[ros-diffs] [cgutman] 37262: - Revert part of r37261