[ros-diffs] [cgutman] 37349: - Enable some code that works now