[ros-diffs] [rnaumann] 69656: revert r69654