Revert 166726 because it may have broken a number of SPEC tests. PR14183.