diff --git a/mozilla/content/html/document/src/nsHTMLFragmentContentSink.cpp b/mozilla/content/html/document/src/nsHTMLFragmentContentSink.cpp
index c5a9a343b20..14e7ba03920 100644
--- a/mozilla/content/html/document/src/nsHTMLFragmentContentSink.cpp
+++ b/mozilla/content/html/document/src/nsHTMLFragmentContentSink.cpp
@@ -595,8 +595,7 @@ nsHTMLFragmentContentSink::AddLeaf(const nsIParserNode& aNode)
             }
           }
 
-          if(nodeType == eHTMLTag_plaintext ||
-             nodeType == eHTMLTag_script    ||
+          if(nodeType == eHTMLTag_script    ||
              nodeType == eHTMLTag_style     ||
              nodeType == eHTMLTag_textarea  ||
              nodeType == eHTMLTag_xmp) {
diff --git a/mozilla/layout/html/document/src/html.css b/mozilla/layout/html/document/src/html.css
index e113c0cfcf1..91639ab4178 100644
--- a/mozilla/layout/html/document/src/html.css
+++ b/mozilla/layout/html/document/src/html.css
@@ -139,7 +139,7 @@ listing {
   margin: 1em 0;
 }
 
-plaintext, xmp, pre {
+xmp, pre {
   display: block;
   font-family: -moz-fixed;
   white-space: pre;
diff --git a/mozilla/layout/style/html.css b/mozilla/layout/style/html.css
index e113c0cfcf1..91639ab4178 100644
--- a/mozilla/layout/style/html.css
+++ b/mozilla/layout/style/html.css
@@ -139,7 +139,7 @@ listing {
   margin: 1em 0;
 }
 
-plaintext, xmp, pre {
+xmp, pre {
   display: block;
   font-family: -moz-fixed;
   white-space: pre;
diff --git a/mozilla/parser/htmlparser/public/nsHTMLTagList.h b/mozilla/parser/htmlparser/public/nsHTMLTagList.h
index aadb05edac1..6fef94db46b 100644
--- a/mozilla/parser/htmlparser/public/nsHTMLTagList.h
+++ b/mozilla/parser/htmlparser/public/nsHTMLTagList.h
@@ -140,7 +140,6 @@ HTML_TAG(optgroup, OptGroup)
 HTML_TAG(option, Option)
 HTML_TAG(p, Paragraph)
 HTML_TAG(param, Shared)
-HTML_TAG(plaintext, Span)
 HTML_TAG(pre, Pre)
 HTML_TAG(q, Shared)
 HTML_TAG(s, Span)
diff --git a/mozilla/parser/htmlparser/src/CNavDTD.cpp b/mozilla/parser/htmlparser/src/CNavDTD.cpp
index a084c2c65ca..87a708e4d28 100644
--- a/mozilla/parser/htmlparser/src/CNavDTD.cpp
+++ b/mozilla/parser/htmlparser/src/CNavDTD.cpp
@@ -1065,7 +1065,6 @@ nsresult CNavDTD::DidHandleStartTag(nsIParserNode& aNode,eHTMLTags aChildTag){
       }
       break;
 
-    case eHTMLTag_plaintext:
     case eHTMLTag_xmp:
       //grab the skipped content and dump it out as text...
       {        
diff --git a/mozilla/parser/htmlparser/src/COtherElements.h b/mozilla/parser/htmlparser/src/COtherElements.h
index 0b2c1b4a6fb..28f69bdc73f 100644
--- a/mozilla/parser/htmlparser/src/COtherElements.h
+++ b/mozilla/parser/htmlparser/src/COtherElements.h
@@ -2345,11 +2345,9 @@ void CElementTable::InitializeElements() {
   mDfltElements[eHTMLTag_p].mContainsGroups.mBits.mSelf=0;
 
   CElement::InitializeLeaf(         mDfltElements[eHTMLTag_param],      eHTMLTag_param, CElement::GetEmptyGroup(), CLeafElement::GetContainedGroups());
-  CElement::Initialize(             mDfltElements[eHTMLTag_plaintext],  eHTMLTag_plaintext);
   CBlockElement::Initialize(        mDfltElements[eHTMLTag_pre],        eHTMLTag_pre);
   mDfltElements[eHTMLTag_pre].mExcludeKids=kPreExcludeKids;
 
-  CElement::Initialize(             mDfltElements[eHTMLTag_plaintext],  eHTMLTag_plaintext);
   CSpecialElement::Initialize(      mDfltElements[eHTMLTag_q],          eHTMLTag_q);
   
   CFontStyleElement::Initialize(    mDfltElements[eHTMLTag_s],          eHTMLTag_s);
diff --git a/mozilla/parser/htmlparser/src/nsElementTable.cpp b/mozilla/parser/htmlparser/src/nsElementTable.cpp
index 9bb9320f9ad..3a6f50ef71a 100644
--- a/mozilla/parser/htmlparser/src/nsElementTable.cpp
+++ b/mozilla/parser/htmlparser/src/nsElementTable.cpp
@@ -943,15 +943,6 @@ void InitializeElementTable(void) {
       /*special props, prop-range*/       kNonContainer, kNoPropRange,
       /*special parents,kids,skip*/       &gParamParents,0,eHTMLTag_unknown);
 
-    Initialize( 
-      /*tag*/                             eHTMLTag_plaintext,
-      /*req-parent excl-parent*/          eHTMLTag_unknown,eHTMLTag_unknown,
-	    /*rootnodes,endrootnodes*/          &gRootTags,&gRootTags,	
-      /*autoclose starttags and endtags*/ 0,0,0,0,
-      /*parent,incl,exclgroups*/          kExtensions, kFlowEntity, kNone,	
-      /*special props, prop-range*/       kNone,kDefaultPropRange,
-      /*special parents,kids,skip*/       0,0,eHTMLTag_plaintext); // Bug  56914
-
     Initialize( 
       /*tag*/                             eHTMLTag_pre,
       /*req-parent excl-parent*/          eHTMLTag_unknown,eHTMLTag_unknown,
diff --git a/mozilla/parser/htmlparser/src/nsHTMLTags.cpp b/mozilla/parser/htmlparser/src/nsHTMLTags.cpp
index a39a785232f..4d4eb73241e 100644
--- a/mozilla/parser/htmlparser/src/nsHTMLTags.cpp
+++ b/mozilla/parser/htmlparser/src/nsHTMLTags.cpp
@@ -199,8 +199,6 @@ static const PRUnichar sHTMLTagUnicodeName_p[] =
   {'p', '\0'};
 static const PRUnichar sHTMLTagUnicodeName_param[] =
   {'p', 'a', 'r', 'a', 'm', '\0'};
-static const PRUnichar sHTMLTagUnicodeName_plaintext[] =
-  {'p', 'l', 'a', 'i', 'n', 't', 'e', 'x', 't', '\0'};
 static const PRUnichar sHTMLTagUnicodeName_pre[] =
   {'p', 'r', 'e', '\0'};
 static const PRUnichar sHTMLTagUnicodeName_q[] =
diff --git a/mozilla/parser/htmlparser/src/nsHTMLTokenizer.cpp b/mozilla/parser/htmlparser/src/nsHTMLTokenizer.cpp
index c4b145e20b7..90820dc80de 100644
--- a/mozilla/parser/htmlparser/src/nsHTMLTokenizer.cpp
+++ b/mozilla/parser/htmlparser/src/nsHTMLTokenizer.cpp
@@ -740,11 +740,9 @@ nsresult nsHTMLTokenizer::ConsumeStartTag(PRUnichar aChar,CToken*& aToken,nsScan
       if(NS_SUCCEEDED(result)) {
         CStartToken* theStartToken = NS_STATIC_CAST(CStartToken*,aToken);
         //XXX - Find a better soution to record content
-        //Added _plaintext to fix bug 46054.
         if(!(mFlags & NS_IPARSER_FLAG_PRESERVE_CONTENT) &&
            (theTag == eHTMLTag_textarea  ||
             theTag == eHTMLTag_xmp       || 
-            theTag == eHTMLTag_plaintext || 
             theTag == eHTMLTag_noscript  ||
             theTag == eHTMLTag_noframes)) {
           NS_ASSERTION(mPreserveTarget == eHTMLTag_unknown,