[ros-diffs] [ekohl] 37446: Revert 37416 because it does not build on all machines.