diff --git a/scss/mixins/_grid-framework.scss b/scss/mixins/_grid-framework.scss
index f5598b5898..236aadf0c7 100644
--- a/scss/mixins/_grid-framework.scss
+++ b/scss/mixins/_grid-framework.scss
@@ -3,14 +3,14 @@
 // Used only by Bootstrap to generate the correct number of grid classes given
 // any value of `$grid-columns`.
 
-@mixin make-grid-columns($columns: $grid-columns, $gutters: $grid-gutter-widths, $breakpoints: $grid-breakpoints) {
+@mixin make-grid-columns($columns: $grid-columns, $gutter: $grid-gutter-width, $breakpoints: $grid-breakpoints) {
   // Common properties for all breakpoints
   %grid-column {
     position: relative;
     width: 100%;
     min-height: 1px; // Prevent columns from collapsing when empty
-    padding-right: ($grid-gutter-width / 2);
-    padding-left:  ($grid-gutter-width / 2);
+    padding-right: ($gutter / 2);
+    padding-left:  ($gutter / 2);
   }
 
   @each $breakpoint in map-keys($breakpoints) {
diff --git a/scss/mixins/_grid.scss b/scss/mixins/_grid.scss
index 7ed93c7384..25bdc74d42 100644
--- a/scss/mixins/_grid.scss
+++ b/scss/mixins/_grid.scss
@@ -20,16 +20,6 @@
   }
 }
 
-// @mixin make-gutters($gutters: $grid-gutter-widths) {
-//   @each $breakpoint in map-keys($gutters) {
-//     @include media-breakpoint-up($breakpoint) {
-//       $gutter: map-get($gutters, $breakpoint);
-//       padding-right: ($gutter / 2);
-//       padding-left:  ($gutter / 2);
-//     }
-//   }
-// }
-
 @mixin make-row() {
   display: flex;
   flex-wrap: wrap;