[ros-diffs] [cwittich] 25065: -revert janderwalds change until because it breaks the gcc 4.x build