diff --git a/lib/Format/TokenAnnotator.cpp b/lib/Format/TokenAnnotator.cpp
index 888b6b67458c6e360cba309bc6d12a04cfd738b7..a7250cf16950cee66ac975d7b15ffed81aac5a69 100644
--- a/lib/Format/TokenAnnotator.cpp
+++ b/lib/Format/TokenAnnotator.cpp
@@ -2319,11 +2319,7 @@ bool TokenAnnotator::spaceRequiredBefore(const AnnotatedLine &Line,
     if ((Left.is(TT_TemplateString) && Left.TokenText.endswith("${")) ||
         (Right.is(TT_TemplateString) && Right.TokenText.startswith("}")))
       return false;
-    // In tagged template literals ("html`bar baz`"), there is no space between
-    // the tag identifier and the template string. getIdentifierInfo makes sure
-    // that the identifier is not a pseudo keyword like `yield`, either.
-    if (Left.is(tok::identifier) && Left.Tok.getIdentifierInfo() == nullptr &&
-        Right.is(TT_TemplateString))
+    if (Left.is(tok::identifier) && Right.is(TT_TemplateString))
       return false;
     if (Right.is(tok::star) &&
         Left.isOneOf(Keywords.kw_function, Keywords.kw_yield))
diff --git a/unittests/Format/FormatTestJS.cpp b/unittests/Format/FormatTestJS.cpp
index db23902ef3eb8bd47fb4332845c44d92582f8fdc..e84f470687ec60a10c80b9a908d60d4784884ec6 100644
--- a/unittests/Format/FormatTestJS.cpp
+++ b/unittests/Format/FormatTestJS.cpp
@@ -1564,7 +1564,6 @@ TEST_F(FormatTestJS, TemplateStrings) {
                "                               aaaaa(  //\n"
                "                                   aaaaa)\n"
                "                             })`);");
-  verifyFormat("yield `hello`;");
 }
 
 TEST_F(FormatTestJS, TemplateStringMultiLineExpression) {