diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 9a71b79fdc0..02ed12e9598 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -152,7 +152,7 @@ jobs:
 
       - name: Build (${{ inputs.profile }})
         run: |
-          python3 ./mach build --use-crown --locked --${{ inputs.profile }}
+          python3 ./mach build --use-crown --locked --${{ inputs.profile }} --features "layout_2013"
           cp -r target/cargo-timings target/cargo-timings-linux
       - name: Smoketest
         run: xvfb-run python3 ./mach smoketest --${{ inputs.profile  }}
diff --git a/components/servo/lib.rs b/components/servo/lib.rs
index 74441979658..465c66feabc 100644
--- a/components/servo/lib.rs
+++ b/components/servo/lib.rs
@@ -1033,8 +1033,8 @@ fn get_layout_factory(legacy_layout: bool) -> Arc<dyn LayoutFactory> {
             }
         } else {
             if legacy_layout {
-                warn!("Runtime option `legacy_layout` was enabled, but the `layout_2013` \
-                feature was not enabled at compile time. Falling back to layout 2020! ");
+                panic!("Runtime option `legacy_layout` was enabled, but the `layout_2013` \
+                feature was not enabled at compile time! ");
            }
         }
     }
diff --git a/ports/servoshell/Cargo.toml b/ports/servoshell/Cargo.toml
index 59dfaf30016..57380bdf1c7 100644
--- a/ports/servoshell/Cargo.toml
+++ b/ports/servoshell/Cargo.toml
@@ -39,7 +39,7 @@ ProductName = "Servo"
 
 [features]
 debugmozjs = ["libservo/debugmozjs"]
-default = ["layout_2013", "max_log_level", "webdriver", "webxr"]
+default = ["max_log_level", "webdriver", "webxr"]
 jitspew = ["libservo/jitspew"]
 js_backtrace = ["libservo/js_backtrace"]
 layout_2013 = ["libservo/layout_2013"]