diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 82048f800d0e8..6869d58b604cf 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -45,22 +45,10 @@ jobs:
     strategy:
       matrix:
         include:
-          - name: mingw-check
-            tidy: false
-            os: ubuntu-20.04-xl
-            env: {}
-          - name: mingw-check-tidy
-            tidy: true
-            os: ubuntu-20.04-xl
-            env: {}
-          - name: x86_64-gnu-llvm-13
-            tidy: false
-            os: ubuntu-20.04-xl
-            env: {}
-          - name: x86_64-gnu-tools
-            tidy: false
+          - name: dist-x86_64-linux-alt
             env:
-              CI_ONLY_WHEN_SUBMODULES_CHANGED: 1
+              IMAGE: dist-x86_64-linux
+            tidy: false
             os: ubuntu-20.04-xl
     timeout-minutes: 600
     runs-on: "${{ matrix.os }}"
@@ -248,10 +236,6 @@ jobs:
           - name: dist-x86_64-linux
             os: ubuntu-20.04-xl
             env: {}
-          - name: dist-x86_64-linux-alt
-            env:
-              IMAGE: dist-x86_64-linux
-            os: ubuntu-20.04-xl
           - name: dist-x86_64-musl
             os: ubuntu-20.04-xl
             env: {}
diff --git a/src/bootstrap/tool.rs b/src/bootstrap/tool.rs
index 9a2100c2fb785..728677ae764f7 100644
--- a/src/bootstrap/tool.rs
+++ b/src/bootstrap/tool.rs
@@ -551,7 +551,7 @@ impl Step for Rustdoc {
             features.push("jemalloc".to_string());
         }
 
-        let cargo = prepare_tool_cargo(
+        let mut cargo = prepare_tool_cargo(
             builder,
             build_compiler,
             Mode::ToolRustc,
@@ -562,6 +562,10 @@ impl Step for Rustdoc {
             features.as_slice(),
         );
 
+        if builder.config.rustc_parallel {
+            cargo.rustflag("--cfg=parallel_compiler");
+        }
+
         builder.info(&format!(
             "Building rustdoc for stage{} ({})",
             target_compiler.stage, target_compiler.host
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index d2a9264c84a12..c5ce6471553f1 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -291,23 +291,11 @@ jobs:
     strategy:
       matrix:
         include:
-          - name: mingw-check
-            <<: *job-linux-xl
-            tidy: false
-
-          - name: mingw-check-tidy
-            <<: *job-linux-xl
-            tidy: true
-
-          - name: x86_64-gnu-llvm-13
-            <<: *job-linux-xl
-            tidy: false
-
-          - name: x86_64-gnu-tools
+          - name: dist-x86_64-linux-alt
+            env:
+              IMAGE: dist-x86_64-linux
             <<: *job-linux-xl
             tidy: false
-            env:
-              CI_ONLY_WHEN_SUBMODULES_CHANGED: 1
 
   auto:
     permissions:
@@ -397,11 +385,6 @@ jobs:
             name: dist-x86_64-linux
             <<: *job-linux-xl
 
-          - name: dist-x86_64-linux-alt
-            env:
-              IMAGE: dist-x86_64-linux
-            <<: *job-linux-xl
-
           - name: dist-x86_64-musl
             <<: *job-linux-xl
 
diff --git a/src/librustdoc/clean/utils.rs b/src/librustdoc/clean/utils.rs
index a12f764fa8e3b..0aa0991cbdbf8 100644
--- a/src/librustdoc/clean/utils.rs
+++ b/src/librustdoc/clean/utils.rs
@@ -475,17 +475,23 @@ pub(crate) fn get_auto_trait_and_blanket_impls(
     cx: &mut DocContext<'_>,
     item_def_id: DefId,
 ) -> impl Iterator<Item = Item> {
-    let auto_impls = cx
-        .sess()
-        .prof
-        .generic_activity("get_auto_trait_impls")
-        .run(|| AutoTraitFinder::new(cx).get_auto_trait_impls(item_def_id));
-    let blanket_impls = cx
-        .sess()
-        .prof
-        .generic_activity("get_blanket_impls")
-        .run(|| BlanketImplFinder { cx }.get_blanket_impls(item_def_id));
-    auto_impls.into_iter().chain(blanket_impls)
+    // FIXME: To be removed once `parallel_compiler` bugs are fixed!
+    // More information in <https://github.com/rust-lang/rust/pull/106745>.
+    if !cfg!(parallel_compiler) {
+        let auto_impls = cx
+            .sess()
+            .prof
+            .generic_activity("get_auto_trait_impls")
+            .run(|| AutoTraitFinder::new(cx).get_auto_trait_impls(item_def_id));
+        let blanket_impls = cx
+            .sess()
+            .prof
+            .generic_activity("get_blanket_impls")
+            .run(|| BlanketImplFinder { cx }.get_blanket_impls(item_def_id));
+        auto_impls.into_iter().chain(blanket_impls)
+    } else {
+        vec![].into_iter().chain(vec![].into_iter())
+    }
 }
 
 /// If `res` has a documentation page associated, store it in the cache.