diff --git a/scss/_variables.scss b/scss/_variables.scss
index 21c96b5d24..f0949eaffe 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -189,7 +189,6 @@ $grid-breakpoints: (
 // Define the maximum width of `.container` for different screen sizes.
 
 $container-max-widths: (
-  xs: 100%,
   sm: 540px,
   md: 720px,
   lg: 960px,
diff --git a/scss/mixins/_grid.scss b/scss/mixins/_grid.scss
index 5c00f57d76..b7d4427496 100644
--- a/scss/mixins/_grid.scss
+++ b/scss/mixins/_grid.scss
@@ -7,6 +7,7 @@
   margin-left: auto;
   padding-right: ($grid-gutter-width / 2);
   padding-left:  ($grid-gutter-width / 2);
+  width: 100%;
 }