[ros-diffs] [hpoussin] 34788: Revert incorrect fix committed in r34077 by cfinck, and replace it by a better one.