[ros-diffs] [cwittich] 25568: revert this change (it broke the build)