[ros-diffs] [cgutman] 35186: - Remove duplicate code