[ros-diffs] [hpoussin] 32273: Revert r32271 ; I thought we decided to remove hacks instead of adding new ones! Correct fix will follow.