diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp
index 51e7c32b7d4c7a..9a020eb6ca7dca 100644
--- a/clang/lib/Format/TokenAnnotator.cpp
+++ b/clang/lib/Format/TokenAnnotator.cpp
@@ -1734,11 +1734,8 @@ class AnnotatingParser {
       else
         Current.setType(TT_LineComment);
     } else if (Current.is(tok::r_paren)) {
-      if (rParenEndsCast(Current)) {
+      if (rParenEndsCast(Current))
         Current.setType(TT_CastRParen);
-        assert(Current.MatchingParen);
-        Current.MatchingParen->setType(TT_Unknown);
-      }
       if (Current.MatchingParen && Current.Next &&
           !Current.Next->isBinaryOperator() &&
           !Current.Next->isOneOf(tok::semi, tok::colon, tok::l_brace,
@@ -1941,20 +1938,8 @@ class AnnotatingParser {
 
       // Certain other tokens right before the parentheses are also signals that
       // this cannot be a cast.
-      if (LeftOfParens->is(TT_TemplateCloser)) {
-        if (LeftOfParens->MatchingParen) {
-          auto *Prev = LeftOfParens->MatchingParen->getPreviousNonComment();
-          if (Prev &&
-              Prev->isOneOf(tok::kw_const_cast, tok::kw_dynamic_cast,
-                            tok::kw_reinterpret_cast, tok::kw_static_cast))
-            // FIXME: Maybe we should handle identifiers ending with "_cast",
-            // e.g. any_cast?
-            return true;
-        }
-        return false;
-      }
       if (LeftOfParens->isOneOf(tok::at, tok::r_square, TT_OverloadedOperator,
-                                tok::ellipsis))
+                                TT_TemplateCloser, tok::ellipsis))
         return false;
     }
 
diff --git a/clang/unittests/Format/FormatTest.cpp b/clang/unittests/Format/FormatTest.cpp
index d45146d5242fbb..f71f8dc5de4560 100644
--- a/clang/unittests/Format/FormatTest.cpp
+++ b/clang/unittests/Format/FormatTest.cpp
@@ -10565,13 +10565,6 @@ TEST_F(FormatTest, FormatsBinaryOperatorsPrecedingEquals) {
 
 TEST_F(FormatTest, FormatsCasts) {
   verifyFormat("Type *A = static_cast<Type *>(P);");
-  verifyFormat("static_cast<Type *>(P);");
-  verifyFormat("static_cast<Type &>(Fun)(Args);");
-  verifyFormat("static_cast<Type &>(*Fun)(Args);");
-  verifyFormat("a = static_cast<Type &>(*Fun)(Args);");
-  verifyFormat("const_cast<Type &>(*Fun)(Args);");
-  verifyFormat("dynamic_cast<Type &>(*Fun)(Args);");
-  verifyFormat("reinterpret_cast<Type &>(*Fun)(Args);");
   verifyFormat("Type *A = (Type *)P;");
   verifyFormat("Type *A = (vector<Type *, int *>)P;");
   verifyFormat("int a = (int)(2.0f);");