[ros-diffs] [ion] 15400: Revert accidental commit