[ros-diffs] [tkreuzer] 34778: revert last commit and instead...