[ros-diffs] [tkreuzer] 49827: revert r49824