diff --git a/src/generators/spacing-padding.less b/src/generators/spacing-padding.less
index 03a703fc5..64a76d993 100644
--- a/src/generators/spacing-padding.less
+++ b/src/generators/spacing-padding.less
@@ -26,34 +26,32 @@
   .generate-padding-utilities(@padding-scale; @i + 1);
 }
 
-.generate-screen-padding-utilities(@padding-scale; @screen; @screen-width; @i: 1) when (@i <= length(@padding-scale)) {
+.generate-screen-padding-utilities(@padding-scale; @screen; @i: 1) when (@i <= length(@padding-scale)) {
   @prefix: ~"@{screen}\:";
   @spacer: extract(@padding-scale, @i);
   @n: extract(@spacer, 1);
   @size: extract(@spacer, 2);
 
-  @media (min-width: @screen-width) {
-    .define-class(~"@{prefix}pt-@{n}", { padding-top: @size; });
-    .define-class(~"@{prefix}pr-@{n}", { padding-right: @size; });
-    .define-class(~"@{prefix}pb-@{n}", { padding-bottom: @size; });
-    .define-class(~"@{prefix}pl-@{n}", { padding-left: @size; });
-    .define-class(~"@{prefix}py-@{n}", {
-      padding-top: @size;
-      padding-bottom: @size;
-    });
-    .define-class(~"@{prefix}px-@{n}", {
-      padding-right: @size;
-      padding-left: @size;
-    });
-    .define-class(~"@{prefix}p-@{n}", {
-      padding-top: @size;
-      padding-right: @size;
-      padding-bottom: @size;
-      padding-left: @size;
-    });
-  }
+  .define-class(~"@{prefix}pt-@{n}", { padding-top: @size; });
+  .define-class(~"@{prefix}pr-@{n}", { padding-right: @size; });
+  .define-class(~"@{prefix}pb-@{n}", { padding-bottom: @size; });
+  .define-class(~"@{prefix}pl-@{n}", { padding-left: @size; });
+  .define-class(~"@{prefix}py-@{n}", {
+    padding-top: @size;
+    padding-bottom: @size;
+  });
+  .define-class(~"@{prefix}px-@{n}", {
+    padding-right: @size;
+    padding-left: @size;
+  });
+  .define-class(~"@{prefix}p-@{n}", {
+    padding-top: @size;
+    padding-right: @size;
+    padding-bottom: @size;
+    padding-left: @size;
+  });
 
-  .generate-screen-padding-utilities(@padding-scale; @screen; @screen-width; (@i + 1));
+  .generate-screen-padding-utilities(@padding-scale; @screen; (@i + 1));
 }
 
 .generate-responsive-padding-utilities(@padding-scale; @screens; @i: 1) when (@i <= length(@screens)) {
@@ -61,7 +59,10 @@
   @name: extract(@screen, 1);
   @screen-width: extract(@screen, 2);
 
-  .generate-screen-padding-utilities(@padding-scale; @name; @screen-width);
+  @media (min-width: @screen-width) {
+    .generate-screen-padding-utilities(@padding-scale; @name);
+  }
+
   .generate-responsive-padding-utilities(@padding-scale; @screens; @i + 1);
 }
 
diff --git a/src/generators/spacing-pull.less b/src/generators/spacing-pull.less
index 4dfa11b4d..19e2befdd 100644
--- a/src/generators/spacing-pull.less
+++ b/src/generators/spacing-pull.less
@@ -26,34 +26,32 @@
   .generate-pull-utilities(@pull-scale; @i + 1);
 }
 
-.generate-screen-pull-utilities(@pull-scale; @screen; @screen-width; @i: 1) when (@i <= length(@pull-scale)) {
+.generate-screen-pull-utilities(@pull-scale; @screen; @i: 1) when (@i <= length(@pull-scale)) {
   @prefix: ~"@{screen}\:";
   @spacer: extract(@pull-scale, @i);
   @n: extract(@spacer, 1);
   @size: extract(@spacer, 2);
 
-  @media (min-width: @screen-width) {
-    .define-class(~"@{prefix}pull-t-@{n}", { margin-top: ~"-@{size}"; });
-    .define-class(~"@{prefix}pull-r-@{n}", { margin-right: ~"-@{size}"; });
-    .define-class(~"@{prefix}pull-b-@{n}", { margin-bottom: ~"-@{size}"; });
-    .define-class(~"@{prefix}pull-l-@{n}", { margin-left: ~"-@{size}"; });
-    .define-class(~"@{prefix}pull-y-@{n}", {
-      margin-top: ~"-@{size}";
-      margin-bottom: ~"-@{size}";
-    });
-    .define-class(~"@{prefix}pull-x-@{n}", {
-      margin-right: ~"-@{size}";
-      margin-left: ~"-@{size}";
-    });
-    .define-class(~"@{prefix}pull-@{n}", {
-      margin-top: ~"-@{size}";
-      margin-right: ~"-@{size}";
-      margin-bottom: ~"-@{size}";
-      margin-left: ~"-@{size}";
-    });
-  }
+  .define-class(~"@{prefix}pull-t-@{n}", { margin-top: ~"-@{size}"; });
+  .define-class(~"@{prefix}pull-r-@{n}", { margin-right: ~"-@{size}"; });
+  .define-class(~"@{prefix}pull-b-@{n}", { margin-bottom: ~"-@{size}"; });
+  .define-class(~"@{prefix}pull-l-@{n}", { margin-left: ~"-@{size}"; });
+  .define-class(~"@{prefix}pull-y-@{n}", {
+    margin-top: ~"-@{size}";
+    margin-bottom: ~"-@{size}";
+  });
+  .define-class(~"@{prefix}pull-x-@{n}", {
+    margin-right: ~"-@{size}";
+    margin-left: ~"-@{size}";
+  });
+  .define-class(~"@{prefix}pull-@{n}", {
+    margin-top: ~"-@{size}";
+    margin-right: ~"-@{size}";
+    margin-bottom: ~"-@{size}";
+    margin-left: ~"-@{size}";
+  });
 
-  .generate-screen-pull-utilities(@pull-scale; @screen; @screen-width; (@i + 1));
+  .generate-screen-pull-utilities(@pull-scale; @screen; (@i + 1));
 }
 
 .generate-responsive-pull-utilities(@pull-scale; @screens; @i: 1) when (@i <= length(@screens)) {
@@ -61,7 +59,10 @@
   @name: extract(@screen, 1);
   @screen-width: extract(@screen, 2);
 
-  .generate-screen-pull-utilities(@pull-scale; @name; @screen-width);
+  @media (min-width: @screen-width) {
+    .generate-screen-pull-utilities(@pull-scale; @name);
+  }
+
   .generate-responsive-pull-utilities(@pull-scale; @screens; @i + 1);
 }