[ros-diffs] [jgardou] 47120: revert unwanted changes