[ros-diffs] [tkreuzer] 38067: revert last commit