[ros-diffs] [jgardou] 55796: revert r55794, the problem is elsewhere