Revert following patches to fix llvmgcc bootstrap.