[ros-diffs] [tkreuzer] 46554: revert r46552 and r46553