[ros-diffs] [janderwald] 24955: revert commit