diff --git a/dom/interfaces/base/nsIDOMWindowUtils.idl b/dom/interfaces/base/nsIDOMWindowUtils.idl
index c55ecaf9bd5d..6d6ceb197448 100644
--- a/dom/interfaces/base/nsIDOMWindowUtils.idl
+++ b/dom/interfaces/base/nsIDOMWindowUtils.idl
@@ -1679,7 +1679,7 @@ interface nsIDOMWindowUtils : nsISupports {
   /**
    * In certain cases the event handling of nodes, form controls in practice,
    * may be disabled. Such cases are for example the existence of disabled
-   * attribute or -moz-user-input: none/disabled.
+   * attribute or -moz-user-input: none.
    */
   boolean isNodeDisabledForEvents(in nsIDOMNode aNode);
 
diff --git a/layout/style/nsCSSProps.cpp b/layout/style/nsCSSProps.cpp
index 9766bf734345..453f9c55177c 100644
--- a/layout/style/nsCSSProps.cpp
+++ b/layout/style/nsCSSProps.cpp
@@ -2136,7 +2136,6 @@ const KTableEntry nsCSSProps::kUserFocusKTable[] = {
 const KTableEntry nsCSSProps::kUserInputKTable[] = {
   { eCSSKeyword_none,     StyleUserInput::None },
   { eCSSKeyword_enabled,  StyleUserInput::Enabled },
-  { eCSSKeyword_disabled, StyleUserInput::Disabled },
   { eCSSKeyword_auto,     StyleUserInput::Auto },
   { eCSSKeyword_UNKNOWN,  -1 }
 };
diff --git a/layout/style/nsStyleConsts.h b/layout/style/nsStyleConsts.h
index 750928176b6b..8b7c3eb1f4e8 100644
--- a/layout/style/nsStyleConsts.h
+++ b/layout/style/nsStyleConsts.h
@@ -206,7 +206,6 @@ enum class StyleUserSelect : uint8_t {
 enum class StyleUserInput : uint8_t {
   None,
   Enabled,
-  Disabled,
   Auto,
 };
 
diff --git a/layout/style/res/forms.css b/layout/style/res/forms.css
index 835d817062b2..b3b0b77fd583 100644
--- a/layout/style/res/forms.css
+++ b/layout/style/res/forms.css
@@ -436,7 +436,6 @@ optgroup:disabled,
 select:disabled:disabled /* Need the pseudo-class twice to have the specificity
                             be at least the same as select[size][multiple] above */
 {
-  -moz-user-input: disabled;
   color: GrayText;
   background-color: ThreeDLightShadow;
   cursor: inherit;
diff --git a/layout/style/test/property_database.js b/layout/style/test/property_database.js
index adc139c46c3b..1aa41622e33d 100644
--- a/layout/style/test/property_database.js
+++ b/layout/style/test/property_database.js
@@ -2632,7 +2632,7 @@ var gCSSProperties = {
     inherited: true,
     type: CSS_TYPE_LONGHAND,
     initial_values: [ "auto" ],
-    other_values: [ "none", "enabled", "disabled" ],
+    other_values: [ "none", "enabled" ],
     invalid_values: []
   },
   "-moz-user-modify": {