diff --git a/dom/imptests/failures/editing/conformancetest/test_runtest.html.json b/dom/imptests/failures/editing/conformancetest/test_runtest.html.json
index 71fbcb430678..2b0858111825 100644
--- a/dom/imptests/failures/editing/conformancetest/test_runtest.html.json
+++ b/dom/imptests/failures/editing/conformancetest/test_runtest.html.json
@@ -3869,6 +3869,7 @@
"[[\"stylewithcss\",\"false\"],[\"defaultparagraphseparator\",\"p\"],[\"inserthorizontalrule\",\"\"]] \"
foob[a]rbaz
\" queryCommandValue(\"defaultparagraphseparator\") after":true,
"[[\"inserthorizontalrule\",\"\"]] \"foo[bar]baz\" compare innerHTML":true,
"[[\"inserthorizontalrule\",\"\"]] \"foo[bar]baz\" compare innerHTML":true,
+ "[[\"inserthorizontalrule\",\"\"]] \"\" compare innerHTML":true,
"[[\"inserthorizontalrule\",\"\"]] \"\": execCommand(\"inserthorizontalrule\", false, \"\") return value":true,
"[[\"inserthorizontalrule\",\"\"]] \"\" compare innerHTML":true,
"[[\"inserthorizontalrule\",\"\"]] \"- foo[bar]baz
\" compare innerHTML":true,
@@ -11044,8 +11045,6 @@
"[[\"outdent\",\"\"]] \"foo
[bar]
\" compare innerHTML":true,
"[[\"stylewithcss\",\"true\"],[\"removeformat\",\"\"]] \"foob[a]rbaz\" compare innerHTML":true,
"[[\"stylewithcss\",\"false\"],[\"removeformat\",\"\"]] \"foob[a]rbaz\" compare innerHTML":true,
- "[[\"removeformat\",\"\"]] \"[foobaz]\" compare innerHTML":true,
- "[[\"removeformat\",\"\"]] \"foobaz\" compare innerHTML":true,
"[[\"removeformat\",\"\"]] \"[foobarbaz]\" compare innerHTML":true,
"[[\"removeformat\",\"\"]] \"foob[a]rbaz\" compare innerHTML":true,
"[[\"removeformat\",\"\"]] \"[foobarbaz]\" compare innerHTML":true,
diff --git a/editor/libeditor/base/nsEditPropertyAtomList.h b/editor/libeditor/base/nsEditPropertyAtomList.h
index 1316a0e6a910..6cc270463136 100644
--- a/editor/libeditor/base/nsEditPropertyAtomList.h
+++ b/editor/libeditor/base/nsEditPropertyAtomList.h
@@ -31,7 +31,6 @@ EDITOR_ATOM(aside, "aside")
EDITOR_ATOM(b, "b")
EDITOR_ATOM(bdo, "bdo")
EDITOR_ATOM(big, "big")
-EDITOR_ATOM(blink, "blink")
EDITOR_ATOM(blockquote, "blockquote")
EDITOR_ATOM(body, "body")
EDITOR_ATOM(br, "br")
diff --git a/editor/libeditor/html/nsHTMLEditUtils.cpp b/editor/libeditor/html/nsHTMLEditUtils.cpp
index c7d819b6b031..179ace18a579 100644
--- a/editor/libeditor/html/nsHTMLEditUtils.cpp
+++ b/editor/libeditor/html/nsHTMLEditUtils.cpp
@@ -59,7 +59,6 @@ nsHTMLEditUtils::IsInlineStyle(nsINode* aNode)
|| (nodeAtom == nsEditProperty::strike)
|| (nodeAtom == nsEditProperty::big)
|| (nodeAtom == nsEditProperty::small)
- || (nodeAtom == nsEditProperty::blink)
|| (nodeAtom == nsEditProperty::sub)
|| (nodeAtom == nsEditProperty::sup)
|| (nodeAtom == nsEditProperty::font);
@@ -629,7 +628,6 @@ static const nsElementInfo kElements[eHTMLTag_userdefined] = {
ELEM(bdo, true, true, GROUP_SPECIAL, GROUP_INLINE_ELEMENT),
ELEM(bgsound, false, false, GROUP_NONE, GROUP_NONE),
ELEM(big, true, true, GROUP_FONTSTYLE, GROUP_INLINE_ELEMENT),
- ELEM(blink, false, false, GROUP_NONE, GROUP_NONE),
ELEM(blockquote, true, true, GROUP_BLOCK, GROUP_FLOW_ELEMENT),
ELEM(body, true, true, GROUP_TOPLEVEL, GROUP_FLOW_ELEMENT),
ELEM(br, false, false, GROUP_SPECIAL, GROUP_NONE),
diff --git a/editor/txtsvc/src/nsTSAtomList.h b/editor/txtsvc/src/nsTSAtomList.h
index 7ec7c7206c40..7ba769339b56 100644
--- a/editor/txtsvc/src/nsTSAtomList.h
+++ b/editor/txtsvc/src/nsTSAtomList.h
@@ -26,7 +26,6 @@
TS_ATOM(sAAtom, "a")
TS_ATOM(sAddressAtom, "address")
TS_ATOM(sBigAtom, "big")
-TS_ATOM(sBlinkAtom, "blink")
TS_ATOM(sBAtom, "b")
TS_ATOM(sCiteAtom, "cite")
TS_ATOM(sCodeAtom, "code")
diff --git a/editor/txtsvc/src/nsTextServicesDocument.cpp b/editor/txtsvc/src/nsTextServicesDocument.cpp
index 9f2106e19846..5ec01d09df0e 100644
--- a/editor/txtsvc/src/nsTextServicesDocument.cpp
+++ b/editor/txtsvc/src/nsTextServicesDocument.cpp
@@ -2292,7 +2292,6 @@ nsTextServicesDocument::IsBlockNode(nsIContent *aContent)
return (sAAtom != atom &&
sAddressAtom != atom &&
sBigAtom != atom &&
- sBlinkAtom != atom &&
sBAtom != atom &&
sCiteAtom != atom &&
sCodeAtom != atom &&
diff --git a/editor/txtsvc/src/nsTextServicesDocument.h b/editor/txtsvc/src/nsTextServicesDocument.h
index be1883be308a..7fa0e6eeadd3 100644
--- a/editor/txtsvc/src/nsTextServicesDocument.h
+++ b/editor/txtsvc/src/nsTextServicesDocument.h
@@ -39,7 +39,6 @@ private:
static nsIAtom *sAAtom;
static nsIAtom *sAddressAtom;
static nsIAtom *sBigAtom;
- static nsIAtom *sBlinkAtom;
static nsIAtom *sBAtom;
static nsIAtom *sCiteAtom;
static nsIAtom *sCodeAtom;