[ros-diffs] [weiden] 16956: revert my last changes, it seems to cause problems when building on *nix