diff --git a/scss/_grid.scss b/scss/_grid.scss
index 57ec5a9d0b94..0bfe5303b9f5 100644
--- a/scss/_grid.scss
+++ b/scss/_grid.scss
@@ -4,11 +4,7 @@
 
 @if $enable-grid-classes {
   // Single container class with breakpoint max-widths
-  .container {
-    @include make-container();
-    @include make-container-max-widths();
-  }
-
+  .container,
   // 100% wide container at all breakpoints
   .container-fluid {
     @include make-container();
diff --git a/scss/mixins/_grid.scss b/scss/mixins/_grid.scss
index b1240b01f15f..29ba741a90e0 100644
--- a/scss/mixins/_grid.scss
+++ b/scss/mixins/_grid.scss
@@ -10,16 +10,6 @@
   margin-left: auto;
 }
 
-
-// For each breakpoint, define the maximum width of the container in a media query
-@mixin make-container-max-widths($max-widths: $container-max-widths, $breakpoints: $grid-breakpoints) {
-  @each $breakpoint, $container-max-width in $max-widths {
-    @include media-breakpoint-up($breakpoint, $breakpoints) {
-      max-width: $container-max-width;
-    }
-  }
-}
-
 @mixin make-row($gutter: $grid-gutter-width) {
   display: flex;
   flex-wrap: wrap;