[ros-diffs] [tkreuzer] 46562: revert r46561