[ros-diffs] [gbrunmar] 35571: This seems to be more correct