[ros-diffs] [tkreuzer] 37923: revert 37475 and 37818