Index: zorg/buildbot/builders/annotated/clang-windows.py
===================================================================
--- zorg/buildbot/builders/annotated/clang-windows.py
+++ zorg/buildbot/builders/annotated/clang-windows.py
@@ -10,15 +10,12 @@

     projects = ['llvm', 'clang', 'lld', 'debuginfo-tests']
     stages = 2
-    stage1_extra_cmake_args = [
+    extra_cmake_args = [
         '-DCMAKE_BUILD_TYPE=Release',
         '-DLLVM_ENABLE_PDB=ON',
         '-DLLVM_ENABLE_ASSERTIONS=ON',
         '-DLLVM_TARGETS_TO_BUILD=all',
     ]
-    extra_cmake_args = stage1_extra_cmake_args + [
-        '-DLLVM_USE_LINKER=lld',
-    ]
     check_targets = ['check-llvm', 'check-clang', 'check-lld', 'check-debuginfo']

     # Check both stage 1 and stage 2.
@@ -31,7 +28,6 @@
     builder.run_steps(projects=projects,
                       stages=stages,
                       extra_cmake_args=extra_cmake_args,
-                      stage1_extra_cmake_args=stage1_extra_cmake_args,
                       check_targets=check_targets,
                       check_stages=check_stages,
                       compiler=compiler,
Index: zorg/buildbot/builders/annotated/sanitizer-windows.py
===================================================================
--- zorg/buildbot/builders/annotated/sanitizer-windows.py
+++ zorg/buildbot/builders/annotated/sanitizer-windows.py
@@ -34,15 +34,12 @@

     projects = ['llvm', 'clang', 'lld', 'compiler-rt']
     stages = 1
-    stage1_extra_cmake_args = [
+    extra_cmake_args = [
         '-DCMAKE_BUILD_TYPE=Release',
         '-DLLVM_ENABLE_PDB=ON',
         '-DLLVM_ENABLE_ASSERTIONS=ON',
         '-DLLVM_TARGETS_TO_BUILD=X86',
     ]
-    extra_cmake_args = stage1_extra_cmake_args + [
-        '-DLLVM_USE_LINKER=lld',
-    ]
     check_targets = ['check-asan', 'check-asan-dynamic', 'check-sanitizer',
                      'check-ubsan', 'check-fuzzer', 'check-cfi',
                      'check-profile', 'check-builtins']
@@ -56,7 +53,6 @@
     builder.run_steps(stages=stages,
                       projects=projects,
                       extra_cmake_args=extra_cmake_args,
-                      stage1_extra_cmake_args=stage1_extra_cmake_args,
                       check_targets=check_targets,
                       compiler=compiler,
                       linker=linker,