[ros-diffs] [tkreuzer] 29908: 2nd try to fix build