diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4a7d945..bb7bde1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -147,6 +147,14 @@
 set(CXXABIS none default libcxxabi libcxxrt libstdc++ libsupc++ vcruntime)
 set_property(CACHE LIBCXX_CXX_ABI PROPERTY STRINGS ;${CXXABIS})
 
+# FIXME: This is a temporary hack to get the buildbots working while D63883 is in flight.
+# Without this all the bots fail while building libc++
+if (DEFINED ENV{USER})
+  if (("$ENV{USER}" STREQUAL "buildbot") OR ("$ENV{USER}" STREQUAL "llvmbb"))
+    message(WARNING "OVERRIDING BUILDBOT CONFIG")
+    set(LIBCXX_CXX_ABI "default" CACHE STRING "FIXME" FORCE)
+  endif()
+endif()
 # Setup the default options if LIBCXX_CXX_ABI is not specified.
 if (LIBCXX_CXX_ABI STREQUAL "default")
   find_path(