[ros-diffs] [cwittich] 45562: partially revert changes from 45560