[ros-diffs] [mnordell] 57271: Hopefully unbreak MSVC build.