[ros-diffs] [tkreuzer] 46493: Revert r46466 this time for real