[ros-diffs] [cgutman] 35612: - Same fix as my last commit