[ros-dev] ros-diffs] [cwittich] 30916: revert r28932