[ros-diffs] [sginsberg] 37515: - woops. temporarily revert system_header to fix build