r123414 broke llvm-gcc bootstrap apparently, revert