[ros-diffs] [cgutman] 43279: - Put some code back which was removed in r43270