[ros-diffs] [tkreuzer] 33751: reapply Magnus Change to fix build. note to Colin: THAT is the reason why ; -)