[ros-diffs] [tkreuzer] 46942: Revert r46582, to see if it fixes the regtests