diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs
index 9421817ae6d8e..0823d3e5dbce4 100644
--- a/src/bootstrap/config.rs
+++ b/src/bootstrap/config.rs
@@ -547,7 +547,7 @@ impl Config {
             set(&mut config.lld_enabled, rust.lld);
             set(&mut config.lldb_enabled, rust.lldb);
             set(&mut config.llvm_tools_enabled, rust.llvm_tools);
-            config.rustc_parallel_queries = rust.experimental_parallel_queries.unwrap_or(false);
+            config.rustc_parallel_queries = rust.experimental_parallel_queries.unwrap_or(true);
             config.rustc_default_linker = rust.default_linker.clone();
             config.musl_root = rust.musl_root.clone().map(PathBuf::from);
             config.save_toolstates = rust.save_toolstates.clone().map(PathBuf::from);
diff --git a/src/librustc/session/mod.rs b/src/librustc/session/mod.rs
index 7363b8b3a78fa..398ce2f66bade 100644
--- a/src/librustc/session/mod.rs
+++ b/src/librustc/session/mod.rs
@@ -841,7 +841,7 @@ impl Session {
 
     #[inline(always)]
     pub fn profiler<F: FnOnce(&mut SelfProfiler) -> ()>(&self, f: F) {
-        if unlikely!(self.self_profiling_active) {
+        if unlikely!(false) {
             self.profiler_active(f)
         }
     }
@@ -902,7 +902,7 @@ impl Session {
     /// Returns the number of query threads that should be used for this
     /// compilation
     pub fn query_threads_from_opts(opts: &config::Options) -> usize {
-        opts.debugging_opts.query_threads.unwrap_or(1)
+        opts.debugging_opts.query_threads.unwrap_or(8)
     }
 
     /// Returns the number of query threads that should be used for this