[ros-diffs] [sginsberg] 38764: - Revert 38762 to fix build