[ros-diffs] [cgutman] 35576: - Remove a hack not needed because of r35575