Temporarily revert r60382. It caused CodeGen/X86/i2k.ll and others to fail.