diff --git a/mozilla/content/html/content/src/nsHTMLAtomList.h b/mozilla/content/html/content/src/nsHTMLAtomList.h
index 7de45fe25d5..1e9ea7e4e7b 100644
--- a/mozilla/content/html/content/src/nsHTMLAtomList.h
+++ b/mozilla/content/html/content/src/nsHTMLAtomList.h
@@ -225,7 +225,6 @@ HTML_ATOM(pagex, "pagex")
 HTML_ATOM(pagey, "pagey")
 HTML_ATOM(param, "param")
 HTML_ATOM(phase, "phase") //XML Events
-HTML_ATOM(plaintext, "plaintext")
 HTML_ATOM(pointSize, "point-size")
 HTML_ATOM(pre, "pre")
 HTML_ATOM(profile, "profile")
diff --git a/mozilla/content/html/content/src/nsHTMLSpanElement.cpp b/mozilla/content/html/content/src/nsHTMLSpanElement.cpp
index 1c59f820bcc..931c578bb0f 100644
--- a/mozilla/content/html/content/src/nsHTMLSpanElement.cpp
+++ b/mozilla/content/html/content/src/nsHTMLSpanElement.cpp
@@ -122,8 +122,7 @@ nsHTMLSpanElement::GetAttributeMappingFunction(nsMapRuleToAttributesFunc& aMapRu
 nsresult
 nsHTMLSpanElement::GetInnerHTML(nsAString& aInnerHTML)
 {
-  if (mNodeInfo->Equals(nsHTMLAtoms::xmp) ||
-      mNodeInfo->Equals(nsHTMLAtoms::plaintext)) {
+  if (mNodeInfo->Equals(nsHTMLAtoms::xmp)) {
     GetContentsAsText(aInnerHTML);
     return NS_OK;
   }
@@ -134,8 +133,7 @@ nsHTMLSpanElement::GetInnerHTML(nsAString& aInnerHTML)
 nsresult
 nsHTMLSpanElement::SetInnerHTML(const nsAString& aInnerHTML)
 {
-  if (mNodeInfo->Equals(nsHTMLAtoms::xmp) ||
-      mNodeInfo->Equals(nsHTMLAtoms::plaintext)) {
+  if (mNodeInfo->Equals(nsHTMLAtoms::xmp)) {
     return ReplaceContentsWithText(aInnerHTML, PR_TRUE);
   }
 
diff --git a/mozilla/content/shared/public/nsHTMLAtomList.h b/mozilla/content/shared/public/nsHTMLAtomList.h
index 7de45fe25d5..1e9ea7e4e7b 100644
--- a/mozilla/content/shared/public/nsHTMLAtomList.h
+++ b/mozilla/content/shared/public/nsHTMLAtomList.h
@@ -225,7 +225,6 @@ HTML_ATOM(pagex, "pagex")
 HTML_ATOM(pagey, "pagey")
 HTML_ATOM(param, "param")
 HTML_ATOM(phase, "phase") //XML Events
-HTML_ATOM(plaintext, "plaintext")
 HTML_ATOM(pointSize, "point-size")
 HTML_ATOM(pre, "pre")
 HTML_ATOM(profile, "profile")