diff --git a/Formula/llvm.rb b/Formula/llvm.rb
index de34372c52495..6ad9c0f4f9681 100644
--- a/Formula/llvm.rb
+++ b/Formula/llvm.rb
@@ -98,6 +98,8 @@ def install
       libcxx
       libunwind
     ]
+    # Can likely be added to the base runtimes array when 11.0.0 is released.
+    runtimes << "libcxxabi" if build.head?
 
     llvmpath = buildpath/"llvm"
     unless build.head?
@@ -105,10 +107,6 @@ def install
       (projects + runtimes).each { |p| resource(p).stage(buildpath/p) }
     end
 
-    # Needed until https://reviews.llvm.org/D63883 lands again.
-    # Use system libcxxabi.
-    rm_r "libcxxabi" if build.head?
-
     py_ver = "3.8"
 
     # Apple's libstdc++ is too old to build LLVM