diff --git a/scss/_containers.scss b/scss/_containers.scss
index 125de8d9b06a..f88f1e5f5e95 100644
--- a/scss/_containers.scss
+++ b/scss/_containers.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/_container.scss b/scss/mixins/_container.scss
index 67c2f5fdca0b..435d0034107d 100644
--- a/scss/mixins/_container.scss
+++ b/scss/mixins/_container.scss
@@ -7,13 +7,3 @@
   margin-right: auto;
   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;
-    }
-  }
-}