Re: [ros-dev] [ros-diffs] [hpoussin] 34856: Revert r34848 andr34850, and replace them by a real fix (hinted by Colin Finck)