[ros-diffs] [hpoussin] 28615: Revert r28603 and add the correct fix