Revert new gcc cchanges in repos