[ros-diffs] [tkreuzer] 47691: revert 47688 and 47689