[ros-diffs] [tkreuzer] 46477: revert r39331