[ros-diffs] [sginsberg] 38116: - Temporarily revert part of 38078 to make build server builds bootable again