[ros-diffs] [cgutman] 36299: - Revert header changes - Requested by Ged