diff --git a/editor/libeditor/html/nsHTMLEditUtils.cpp b/editor/libeditor/html/nsHTMLEditUtils.cpp
index 6eb936e37d88..84126b3a4385 100644
--- a/editor/libeditor/html/nsHTMLEditUtils.cpp
+++ b/editor/libeditor/html/nsHTMLEditUtils.cpp
@@ -657,7 +657,6 @@ static const nsElementInfo kElements[eHTMLTag_userdefined] = {
   ELEM(script, PR_TRUE, PR_FALSE, GROUP_HEAD_CONTENT | GROUP_SPECIAL,
        GROUP_LEAF),
   ELEM(select, PR_TRUE, PR_FALSE, GROUP_FORMCONTROL, GROUP_SELECT_CONTENT),
-  ELEM(server, PR_FALSE, PR_FALSE, GROUP_NONE, GROUP_NONE),
   ELEM(small, PR_TRUE, PR_TRUE, GROUP_FONTSTYLE, GROUP_INLINE_ELEMENT),
   ELEM(sound, PR_FALSE, PR_FALSE, GROUP_NONE, GROUP_NONE),
   ELEM(spacer, PR_FALSE, PR_FALSE, GROUP_NONE, GROUP_NONE),
diff --git a/parser/htmlparser/public/nsHTMLTagList.h b/parser/htmlparser/public/nsHTMLTagList.h
index c2ab73bfdb6f..3db9a14918ca 100644
--- a/parser/htmlparser/public/nsHTMLTagList.h
+++ b/parser/htmlparser/public/nsHTMLTagList.h
@@ -146,7 +146,6 @@ HTML_TAG(s, Span)
 HTML_TAG(samp, Span)
 HTML_TAG(script, Script)
 HTML_TAG(select, Select)
-HTML_TAG(server, Span)
 HTML_TAG(small, Span)
 HTML_TAG(sound, Span)
 HTML_TAG(spacer, Shared)
diff --git a/parser/htmlparser/src/nsElementTable.cpp b/parser/htmlparser/src/nsElementTable.cpp
index 3f7ee47d8869..3c19d2dcaa84 100644
--- a/parser/htmlparser/src/nsElementTable.cpp
+++ b/parser/htmlparser/src/nsElementTable.cpp
@@ -1024,16 +1024,6 @@ const nsHTMLElement gHTMLElements[] = {
     /*special parents,kids,skip*/       &gInForm,&gContainsOpts,eHTMLTag_unknown,
     /*contain-func*/                    0
   },
-  {
-    /*tag*/                             eHTMLTag_server,
-    /*req-parent excl-parent*/          eHTMLTag_unknown,eHTMLTag_unknown,
-    /*rootnodes,endrootnodes*/          &gRootTags,&gRootTags,
-    /*autoclose starttags and endtags*/ 0,0,0,0,
-    /*parent,incl,exclgroups*/          (kSpecial|kHeadMisc), kCDATA, kNone,
-    /*special props, prop-range*/       (kNoStyleLeaksIn|kLegalOpen), kNoPropRange,
-    /*special parents,kids,skip*/       0,&gContainsText,eHTMLTag_unknown,
-    /*contain-func*/                    0
-  },
   {
     /*tag*/                             eHTMLTag_small,
     /*req-parent excl-parent*/          eHTMLTag_unknown,eHTMLTag_unknown,
diff --git a/parser/htmlparser/src/nsHTMLTags.cpp b/parser/htmlparser/src/nsHTMLTags.cpp
index 146155a6d3a8..4414d534e3b2 100644
--- a/parser/htmlparser/src/nsHTMLTags.cpp
+++ b/parser/htmlparser/src/nsHTMLTags.cpp
@@ -213,8 +213,6 @@ static const PRUnichar sHTMLTagUnicodeName_script[] =
   {'s', 'c', 'r', 'i', 'p', 't', '\0'};
 static const PRUnichar sHTMLTagUnicodeName_select[] =
   {'s', 'e', 'l', 'e', 'c', 't', '\0'};
-static const PRUnichar sHTMLTagUnicodeName_server[] =
-  {'s', 'e', 'r', 'v', 'e', 'r', '\0'};
 static const PRUnichar sHTMLTagUnicodeName_small[] =
   {'s', 'm', 'a', 'l', 'l', '\0'};
 static const PRUnichar sHTMLTagUnicodeName_sound[] =