[ros-diffs] [gedmurphy] 26858: revert 26844 to fall back in line with widl