[ros-diffs] [tkreuzer] 46744: revert r46742