[ros-diffs] [jgardou] 47218: Revert part of 47209. Hope this time is the good one