[ros-diffs] [peterw] 29769: - Revert my last commit as it is wrong.