[ros-diffs] [tkreuzer] 44007: revert r43841