diff --git a/config.toml.example b/config.toml.example
index 8b11014edae79..1d5107cf01361 100644
--- a/config.toml.example
+++ b/config.toml.example
@@ -289,7 +289,7 @@
 #debuginfo = false
 
 # Whether or not line number debug information is emitted
-#debuginfo-lines = false
+#debuginfo-lines = true
 
 # Whether or not to only build debuginfo for the standard library if enabled.
 # If enabled, this will not compile the compiler with debuginfo, just the
diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs
index 0f249eee00022..0a19f43fb445c 100644
--- a/src/bootstrap/config.rs
+++ b/src/bootstrap/config.rs
@@ -625,13 +625,11 @@ impl Config {
         let default = true;
         config.rust_optimize = optimize.unwrap_or(default);
 
-        let default = match &config.channel[..] {
-            "stable" | "beta" | "nightly" => true,
-            _ => false,
-        };
         config.rust_debuginfo_lines = debuginfo_lines.unwrap_or(default);
+
+        let default = false;
         config.rust_debuginfo_only_std = debuginfo_only_std.unwrap_or(default);
-        config.rust_debuginfo_tools = debuginfo_tools.unwrap_or(false);
+        config.rust_debuginfo_tools = debuginfo_tools.unwrap_or(default);
 
         let default = debug == Some(true);
         config.rust_debuginfo = debuginfo.unwrap_or(default);