diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs
index 33c7141e7044..35e62f17f2e0 100644
--- a/src/bootstrap/config.rs
+++ b/src/bootstrap/config.rs
@@ -528,7 +528,7 @@ impl Config {
         // Now that we've reached the end of our configuration, infer the
         // default values for all options that we haven't otherwise stored yet.
 
-        let default = config.channel == "nightly";
+        let default = false;
         config.llvm_assertions = llvm_assertions.unwrap_or(default);
 
         let default = match &config.channel[..] {
diff --git a/src/ci/run.sh b/src/ci/run.sh
index b4fa033c4a66..deea4fec4dcf 100755
--- a/src/ci/run.sh
+++ b/src/ci/run.sh
@@ -49,7 +49,7 @@ if [ "$DEPLOY$DEPLOY_ALT" != "" ]; then
   if [ "$NO_LLVM_ASSERTIONS" = "1" ]; then
     RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --disable-llvm-assertions"
   elif [ "$DEPLOY_ALT" != "" ]; then
-    RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --disable-llvm-assertions"
+    RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-llvm-assertions"
   fi
 else
   # We almost always want debug assertions enabled, but sometimes this takes too