[ros-diffs] [janderwald] 23023: revert prev commit