[ros-diffs] [cgutman] 35110: - Forgot to include one fix in my last commit