diff --git a/components/style/properties/longhand/box.mako.rs b/components/style/properties/longhand/box.mako.rs
index 9c445436d0f..c69c32fdb4f 100644
--- a/components/style/properties/longhand/box.mako.rs
+++ b/components/style/properties/longhand/box.mako.rs
@@ -407,7 +407,6 @@ ${helpers.single_keyword("overflow-clip-box", "padding-box content-box",
 // FIXME(pcwalton, #2742): Implement scrolling for `scroll` and `auto`.
 ${helpers.single_keyword("overflow-x", "visible hidden scroll auto",
                          need_clone=True, animation_value_type="none",
-                         extra_gecko_aliases="-moz-scrollbars-none=hidden",
                          extra_gecko_values="-moz-hidden-unscrollable",
                          custom_consts=overflow_custom_consts,
                          gecko_constant_prefix="NS_STYLE_OVERFLOW",
diff --git a/components/style/properties/shorthand/box.mako.rs b/components/style/properties/shorthand/box.mako.rs
index 0dd320735a8..a1bcd207f58 100644
--- a/components/style/properties/shorthand/box.mako.rs
+++ b/components/style/properties/shorthand/box.mako.rs
@@ -27,6 +27,12 @@
                         overflow_y: SpecifiedValue::scroll,
                     })
                 }
+                "-moz-scrollbars-none" => {
+                    Ok(Longhands {
+                        overflow_x: SpecifiedValue::hidden,
+                        overflow_y: SpecifiedValue::hidden,
+                    })
+                }
                 _ => Err(())
             });
             if moz_kw_found.is_ok() {