[ros-diffs] [gedmurphy] 26796: a bit of rearranging