[ros-diffs] [tkreuzer] 37912: revert r35657