[ros-diffs] [amunger] 23396: Fix the build on linux (for real). Patch from hpoussin, who checked that it didn't break the win32 build. This also reverts 23394.