diff --git a/mozilla/content/base/src/nsRuleNode.cpp b/mozilla/content/base/src/nsRuleNode.cpp
index 2586151f3de..a819357aad2 100644
--- a/mozilla/content/base/src/nsRuleNode.cpp
+++ b/mozilla/content/base/src/nsRuleNode.cpp
@@ -2459,22 +2459,6 @@ nsRuleNode::ComputeUIResetData(nsStyleStruct* aStartData,
     ui->mUserSelect = parentUI->mUserSelect;
   }
 
-  // key-equivalent: none, enum XXX, inherit
-  nsCSSValueList*  keyEquiv = uiData.mKeyEquivalent;
-  if (keyEquiv) {
-    // XXX need to deal with multiple values
-    if (eCSSUnit_Enumerated == keyEquiv->mValue.GetUnit()) {
-      ui->mKeyEquivalent = PRUnichar(0);  // XXX To be implemented
-    }
-    else if (eCSSUnit_None == keyEquiv->mValue.GetUnit()) {
-      ui->mKeyEquivalent = PRUnichar(0);
-    }
-    else if (eCSSUnit_Inherit == keyEquiv->mValue.GetUnit()) {
-      inherited = PR_TRUE;
-      ui->mKeyEquivalent = parentUI->mKeyEquivalent;
-    }
-  }
-
   // force-broken-image-icons: integer
   if (eCSSUnit_Integer == uiData.mForceBrokenImageIcon.GetUnit()) {
     ui->mForceBrokenImageIcon = uiData.mForceBrokenImageIcon.GetIntValue();
diff --git a/mozilla/content/base/src/nsStyleContext.cpp b/mozilla/content/base/src/nsStyleContext.cpp
index 0ac6c145add..2f63b5eae9b 100644
--- a/mozilla/content/base/src/nsStyleContext.cpp
+++ b/mozilla/content/base/src/nsStyleContext.cpp
@@ -829,9 +829,8 @@ void nsStyleContext::DumpRegressionData(nsPresContext* aPresContext, FILE* out,
   // UIReset
   IndentBy(out,aIndent);
   const nsStyleUIReset* uiReset = GetStyleUIReset();
-  fprintf(out, "<uireset data=\"%d %d\" />\n",
-    (int)uiReset->mUserSelect,
-    (int)uiReset->mKeyEquivalent);
+  fprintf(out, "<uireset data=\"%d\" />\n",
+    (int)uiReset->mUserSelect);
 
   // Column
   IndentBy(out,aIndent);
diff --git a/mozilla/content/html/style/src/nsCSSParser.cpp b/mozilla/content/html/style/src/nsCSSParser.cpp
index ed15097f3ab..250597cdb9a 100644
--- a/mozilla/content/html/style/src/nsCSSParser.cpp
+++ b/mozilla/content/html/style/src/nsCSSParser.cpp
@@ -4381,9 +4381,6 @@ PRBool CSSParserImpl::ParseSingleValueProperty(nsresult& aErrorCode,
   case eCSSProperty_letter_spacing:
   case eCSSProperty_word_spacing:
     return ParseVariant(aErrorCode, aValue, VARIANT_HL | VARIANT_NORMAL, nsnull);
-  case eCSSProperty_key_equivalent:
-    return ParseVariant(aErrorCode, aValue, VARIANT_HOK,
-                        nsCSSProps::kKeyEquivalentKTable);
   case eCSSProperty_line_height:
     return ParsePositiveVariant(aErrorCode, aValue, VARIANT_HLPN | VARIANT_NORMAL, nsnull);
   case eCSSProperty_list_style_image:
diff --git a/mozilla/content/html/style/src/nsCSSStruct.cpp b/mozilla/content/html/style/src/nsCSSStruct.cpp
index 0647a9d581d..a0684e973b7 100644
--- a/mozilla/content/html/style/src/nsCSSStruct.cpp
+++ b/mozilla/content/html/style/src/nsCSSStruct.cpp
@@ -1013,7 +1013,7 @@ void nsCSSContent::List(FILE* out, PRInt32 aIndent) const
 // --- nsCSSUserInterface -----------------
 
 nsCSSUserInterface::nsCSSUserInterface(void)
-  : mKeyEquivalent(nsnull), mCursor(nsnull)
+  : mCursor(nsnull)
 {
   MOZ_COUNT_CTOR(nsCSSUserInterface);
 }
@@ -1022,20 +1022,17 @@ nsCSSUserInterface::nsCSSUserInterface(const nsCSSUserInterface& aCopy)
   : mUserInput(aCopy.mUserInput),
     mUserModify(aCopy.mUserModify),
     mUserSelect(aCopy.mUserSelect),
-    mKeyEquivalent(nsnull),
     mUserFocus(aCopy.mUserFocus),
     mCursor(nsnull),
     mForceBrokenImageIcon(aCopy.mForceBrokenImageIcon)
 {
   MOZ_COUNT_CTOR(nsCSSUserInterface);
   CSS_IF_COPY(mCursor, nsCSSValueList);
-  CSS_IF_COPY(mKeyEquivalent, nsCSSValueList);
 }
 
 nsCSSUserInterface::~nsCSSUserInterface(void)
 {
   MOZ_COUNT_DTOR(nsCSSUserInterface);
-  CSS_IF_DELETE(mKeyEquivalent);
   CSS_IF_DELETE(mCursor);
 }
 
@@ -1049,11 +1046,6 @@ void nsCSSUserInterface::List(FILE* out, PRInt32 aIndent) const
   mUserInput.AppendToString(buffer, eCSSProperty_user_input);
   mUserModify.AppendToString(buffer, eCSSProperty_user_modify);
   mUserSelect.AppendToString(buffer, eCSSProperty_user_select);
-  nsCSSValueList*  keyEquiv = mKeyEquivalent;
-  while (nsnull != keyEquiv) {
-    keyEquiv->mValue.AppendToString(buffer, eCSSProperty_key_equivalent);
-    keyEquiv= keyEquiv->mNext;
-  }
   mUserFocus.AppendToString(buffer, eCSSProperty_user_focus);
   
   nsCSSValueList*  cursor = mCursor;
diff --git a/mozilla/content/shared/public/nsCSSPropList.h b/mozilla/content/shared/public/nsCSSPropList.h
index 6392ec03691..e08ef85ffd9 100644
--- a/mozilla/content/shared/public/nsCSSPropList.h
+++ b/mozilla/content/shared/public/nsCSSPropList.h
@@ -355,7 +355,6 @@ CSS_PROP_FONT(font-weight, font_weight, FontWeight, Font, mWeight, eCSSType_Valu
 CSS_PROP_UIRESET(-moz-force-broken-image-icon, force_broken_image_icon, MozForceBrokenImageIcon, UserInterface, mForceBrokenImageIcon, eCSSType_Value, PR_FALSE, nsnull) // bug 58646
 CSS_PROP_POSITION(height, height, Height, Position, mHeight, eCSSType_Value, PR_TRUE, nsnull)
 CSS_PROP_LIST(-moz-image-region, image_region, MozImageRegion, List, mImageRegion, eCSSType_Rect, PR_TRUE, nsnull)
-CSS_PROP_UIRESET(-moz-key-equivalent, key_equivalent, MozKeyEquivalent, UserInterface, mKeyEquivalent, eCSSType_ValueList, PR_FALSE, kKeyEquivalentKTable) // This will need some other notification, but what? // XXX bug 3935
 CSS_PROP_POSITION(left, left, Left, Position, mOffset.mLeft, eCSSType_Value, PR_TRUE, nsnull)
 CSS_PROP_TEXT(letter-spacing, letter_spacing, LetterSpacing, Text, mLetterSpacing, eCSSType_Value, PR_TRUE, nsnull)
 CSS_PROP_TEXT(line-height, line_height, LineHeight, Text, mLineHeight, eCSSType_Value, PR_TRUE, nsnull)
diff --git a/mozilla/content/shared/public/nsStyleStruct.h b/mozilla/content/shared/public/nsStyleStruct.h
index dbcf5a087ff..69fa5413d8e 100644
--- a/mozilla/content/shared/public/nsStyleStruct.h
+++ b/mozilla/content/shared/public/nsStyleStruct.h
@@ -1108,7 +1108,6 @@ struct nsStyleUIReset: public nsStyleStruct {
   static nsChangeHint MaxDifference();
 #endif
 
-  PRUnichar mKeyEquivalent;   // [reset] XXX what type should this be?
   PRUint8   mUserSelect;      // [reset] (selection-style)
   PRUint8   mForceBrokenImageIcon; // [reset]  (0 if not forcing, otherwise forcing)
 };
diff --git a/mozilla/content/shared/src/nsStyleStruct.cpp b/mozilla/content/shared/src/nsStyleStruct.cpp
index 1006fb4aff7..a194b580f12 100644
--- a/mozilla/content/shared/src/nsStyleStruct.cpp
+++ b/mozilla/content/shared/src/nsStyleStruct.cpp
@@ -1732,14 +1732,12 @@ nsChangeHint nsStyleUserInterface::MaxDifference()
 nsStyleUIReset::nsStyleUIReset(void) 
 { 
   mUserSelect = NS_STYLE_USER_SELECT_AUTO;
-  mKeyEquivalent = PRUnichar(0); // XXX what type should this be?
   mForceBrokenImageIcon = 0;
 }
 
 nsStyleUIReset::nsStyleUIReset(const nsStyleUIReset& aSource) 
 {
   mUserSelect = aSource.mUserSelect;
-  mKeyEquivalent = aSource.mKeyEquivalent;
   mForceBrokenImageIcon = aSource.mForceBrokenImageIcon;
 }
 
@@ -1751,7 +1749,6 @@ nsChangeHint nsStyleUIReset::CalcDifference(const nsStyleUIReset& aOther) const
 {
   if (mForceBrokenImageIcon == aOther.mForceBrokenImageIcon) {
     if (mUserSelect == aOther.mUserSelect) {
-      // ignore mKeyEquivalent
       return NS_STYLE_HINT_NONE;
     }
     return NS_STYLE_HINT_VISUAL;
diff --git a/mozilla/dom/public/idl/css/nsIDOMCSS2Properties.idl b/mozilla/dom/public/idl/css/nsIDOMCSS2Properties.idl
index 50fc1ac2ac2..f1d226c9d95 100644
--- a/mozilla/dom/public/idl/css/nsIDOMCSS2Properties.idl
+++ b/mozilla/dom/public/idl/css/nsIDOMCSS2Properties.idl
@@ -406,7 +406,7 @@ interface nsIDOMCSS2Properties : nsISupports
                                         // raises(DOMException) on setting
 };
 
-[scriptable, uuid(9156b694-3c27-4e73-9990-f8d8a1634129)]
+[scriptable, uuid(71c7f595-fdfe-46d7-8a93-473a1c1fbab3)]
 interface nsIDOMNSCSS2Properties : nsIDOMCSS2Properties
 {
            /* Non-DOM 2 extensions */
@@ -499,9 +499,6 @@ interface nsIDOMNSCSS2Properties : nsIDOMCSS2Properties
            attribute DOMString        MozImageRegion;
                                         // raises(DOMException) on setting
 
-           attribute DOMString        MozKeyEquivalent;
-                                        // raises(DOMException) on setting
-
            attribute DOMString        MozMarginEnd;
                                         // raises(DOMException) on setting
 
diff --git a/mozilla/layout/style/nsCSSParser.cpp b/mozilla/layout/style/nsCSSParser.cpp
index ed15097f3ab..250597cdb9a 100644
--- a/mozilla/layout/style/nsCSSParser.cpp
+++ b/mozilla/layout/style/nsCSSParser.cpp
@@ -4381,9 +4381,6 @@ PRBool CSSParserImpl::ParseSingleValueProperty(nsresult& aErrorCode,
   case eCSSProperty_letter_spacing:
   case eCSSProperty_word_spacing:
     return ParseVariant(aErrorCode, aValue, VARIANT_HL | VARIANT_NORMAL, nsnull);
-  case eCSSProperty_key_equivalent:
-    return ParseVariant(aErrorCode, aValue, VARIANT_HOK,
-                        nsCSSProps::kKeyEquivalentKTable);
   case eCSSProperty_line_height:
     return ParsePositiveVariant(aErrorCode, aValue, VARIANT_HLPN | VARIANT_NORMAL, nsnull);
   case eCSSProperty_list_style_image:
diff --git a/mozilla/layout/style/nsCSSPropList.h b/mozilla/layout/style/nsCSSPropList.h
index 6392ec03691..e08ef85ffd9 100644
--- a/mozilla/layout/style/nsCSSPropList.h
+++ b/mozilla/layout/style/nsCSSPropList.h
@@ -355,7 +355,6 @@ CSS_PROP_FONT(font-weight, font_weight, FontWeight, Font, mWeight, eCSSType_Valu
 CSS_PROP_UIRESET(-moz-force-broken-image-icon, force_broken_image_icon, MozForceBrokenImageIcon, UserInterface, mForceBrokenImageIcon, eCSSType_Value, PR_FALSE, nsnull) // bug 58646
 CSS_PROP_POSITION(height, height, Height, Position, mHeight, eCSSType_Value, PR_TRUE, nsnull)
 CSS_PROP_LIST(-moz-image-region, image_region, MozImageRegion, List, mImageRegion, eCSSType_Rect, PR_TRUE, nsnull)
-CSS_PROP_UIRESET(-moz-key-equivalent, key_equivalent, MozKeyEquivalent, UserInterface, mKeyEquivalent, eCSSType_ValueList, PR_FALSE, kKeyEquivalentKTable) // This will need some other notification, but what? // XXX bug 3935
 CSS_PROP_POSITION(left, left, Left, Position, mOffset.mLeft, eCSSType_Value, PR_TRUE, nsnull)
 CSS_PROP_TEXT(letter-spacing, letter_spacing, LetterSpacing, Text, mLetterSpacing, eCSSType_Value, PR_TRUE, nsnull)
 CSS_PROP_TEXT(line-height, line_height, LineHeight, Text, mLineHeight, eCSSType_Value, PR_TRUE, nsnull)
diff --git a/mozilla/layout/style/nsCSSStruct.cpp b/mozilla/layout/style/nsCSSStruct.cpp
index 0647a9d581d..a0684e973b7 100644
--- a/mozilla/layout/style/nsCSSStruct.cpp
+++ b/mozilla/layout/style/nsCSSStruct.cpp
@@ -1013,7 +1013,7 @@ void nsCSSContent::List(FILE* out, PRInt32 aIndent) const
 // --- nsCSSUserInterface -----------------
 
 nsCSSUserInterface::nsCSSUserInterface(void)
-  : mKeyEquivalent(nsnull), mCursor(nsnull)
+  : mCursor(nsnull)
 {
   MOZ_COUNT_CTOR(nsCSSUserInterface);
 }
@@ -1022,20 +1022,17 @@ nsCSSUserInterface::nsCSSUserInterface(const nsCSSUserInterface& aCopy)
   : mUserInput(aCopy.mUserInput),
     mUserModify(aCopy.mUserModify),
     mUserSelect(aCopy.mUserSelect),
-    mKeyEquivalent(nsnull),
     mUserFocus(aCopy.mUserFocus),
     mCursor(nsnull),
     mForceBrokenImageIcon(aCopy.mForceBrokenImageIcon)
 {
   MOZ_COUNT_CTOR(nsCSSUserInterface);
   CSS_IF_COPY(mCursor, nsCSSValueList);
-  CSS_IF_COPY(mKeyEquivalent, nsCSSValueList);
 }
 
 nsCSSUserInterface::~nsCSSUserInterface(void)
 {
   MOZ_COUNT_DTOR(nsCSSUserInterface);
-  CSS_IF_DELETE(mKeyEquivalent);
   CSS_IF_DELETE(mCursor);
 }
 
@@ -1049,11 +1046,6 @@ void nsCSSUserInterface::List(FILE* out, PRInt32 aIndent) const
   mUserInput.AppendToString(buffer, eCSSProperty_user_input);
   mUserModify.AppendToString(buffer, eCSSProperty_user_modify);
   mUserSelect.AppendToString(buffer, eCSSProperty_user_select);
-  nsCSSValueList*  keyEquiv = mKeyEquivalent;
-  while (nsnull != keyEquiv) {
-    keyEquiv->mValue.AppendToString(buffer, eCSSProperty_key_equivalent);
-    keyEquiv= keyEquiv->mNext;
-  }
   mUserFocus.AppendToString(buffer, eCSSProperty_user_focus);
   
   nsCSSValueList*  cursor = mCursor;
diff --git a/mozilla/layout/style/nsRuleNode.cpp b/mozilla/layout/style/nsRuleNode.cpp
index 2586151f3de..a819357aad2 100644
--- a/mozilla/layout/style/nsRuleNode.cpp
+++ b/mozilla/layout/style/nsRuleNode.cpp
@@ -2459,22 +2459,6 @@ nsRuleNode::ComputeUIResetData(nsStyleStruct* aStartData,
     ui->mUserSelect = parentUI->mUserSelect;
   }
 
-  // key-equivalent: none, enum XXX, inherit
-  nsCSSValueList*  keyEquiv = uiData.mKeyEquivalent;
-  if (keyEquiv) {
-    // XXX need to deal with multiple values
-    if (eCSSUnit_Enumerated == keyEquiv->mValue.GetUnit()) {
-      ui->mKeyEquivalent = PRUnichar(0);  // XXX To be implemented
-    }
-    else if (eCSSUnit_None == keyEquiv->mValue.GetUnit()) {
-      ui->mKeyEquivalent = PRUnichar(0);
-    }
-    else if (eCSSUnit_Inherit == keyEquiv->mValue.GetUnit()) {
-      inherited = PR_TRUE;
-      ui->mKeyEquivalent = parentUI->mKeyEquivalent;
-    }
-  }
-
   // force-broken-image-icons: integer
   if (eCSSUnit_Integer == uiData.mForceBrokenImageIcon.GetUnit()) {
     ui->mForceBrokenImageIcon = uiData.mForceBrokenImageIcon.GetIntValue();
diff --git a/mozilla/layout/style/nsStyleContext.cpp b/mozilla/layout/style/nsStyleContext.cpp
index 0ac6c145add..2f63b5eae9b 100644
--- a/mozilla/layout/style/nsStyleContext.cpp
+++ b/mozilla/layout/style/nsStyleContext.cpp
@@ -829,9 +829,8 @@ void nsStyleContext::DumpRegressionData(nsPresContext* aPresContext, FILE* out,
   // UIReset
   IndentBy(out,aIndent);
   const nsStyleUIReset* uiReset = GetStyleUIReset();
-  fprintf(out, "<uireset data=\"%d %d\" />\n",
-    (int)uiReset->mUserSelect,
-    (int)uiReset->mKeyEquivalent);
+  fprintf(out, "<uireset data=\"%d\" />\n",
+    (int)uiReset->mUserSelect);
 
   // Column
   IndentBy(out,aIndent);
diff --git a/mozilla/layout/style/nsStyleStruct.cpp b/mozilla/layout/style/nsStyleStruct.cpp
index 1006fb4aff7..a194b580f12 100644
--- a/mozilla/layout/style/nsStyleStruct.cpp
+++ b/mozilla/layout/style/nsStyleStruct.cpp
@@ -1732,14 +1732,12 @@ nsChangeHint nsStyleUserInterface::MaxDifference()
 nsStyleUIReset::nsStyleUIReset(void) 
 { 
   mUserSelect = NS_STYLE_USER_SELECT_AUTO;
-  mKeyEquivalent = PRUnichar(0); // XXX what type should this be?
   mForceBrokenImageIcon = 0;
 }
 
 nsStyleUIReset::nsStyleUIReset(const nsStyleUIReset& aSource) 
 {
   mUserSelect = aSource.mUserSelect;
-  mKeyEquivalent = aSource.mKeyEquivalent;
   mForceBrokenImageIcon = aSource.mForceBrokenImageIcon;
 }
 
@@ -1751,7 +1749,6 @@ nsChangeHint nsStyleUIReset::CalcDifference(const nsStyleUIReset& aOther) const
 {
   if (mForceBrokenImageIcon == aOther.mForceBrokenImageIcon) {
     if (mUserSelect == aOther.mUserSelect) {
-      // ignore mKeyEquivalent
       return NS_STYLE_HINT_NONE;
     }
     return NS_STYLE_HINT_VISUAL;
diff --git a/mozilla/layout/style/nsStyleStruct.h b/mozilla/layout/style/nsStyleStruct.h
index dbcf5a087ff..69fa5413d8e 100644
--- a/mozilla/layout/style/nsStyleStruct.h
+++ b/mozilla/layout/style/nsStyleStruct.h
@@ -1108,7 +1108,6 @@ struct nsStyleUIReset: public nsStyleStruct {
   static nsChangeHint MaxDifference();
 #endif
 
-  PRUnichar mKeyEquivalent;   // [reset] XXX what type should this be?
   PRUint8   mUserSelect;      // [reset] (selection-style)
   PRUint8   mForceBrokenImageIcon; // [reset]  (0 if not forcing, otherwise forcing)
 };