[ros-diffs] [hpoussin] 31958: Revert r31093