diff --git a/clang/lib/CodeGen/CodeGenFunction.cpp b/clang/lib/CodeGen/CodeGenFunction.cpp
index 9d32ad2e7038..fc7a10d08b28 100644
--- a/clang/lib/CodeGen/CodeGenFunction.cpp
+++ b/clang/lib/CodeGen/CodeGenFunction.cpp
@@ -723,25 +723,6 @@ static void markAsIgnoreThreadCheckingAtRuntime(llvm::Function *Fn) {
   Fn->removeFnAttr(llvm::Attribute::SanitizeThread);
 }
 
-static bool matchesStlAllocatorFn(const Decl *D, const ASTContext &Ctx) {
-  auto *MD = dyn_cast_or_null<CXXMethodDecl>(D);
-  if (!MD || !MD->getName().equals("allocate") ||
-      (MD->getNumParams() != 1 && MD->getNumParams() != 2))
-    return false;
-
-  if (MD->parameters()[0]->getType().getCanonicalType() != Ctx.getSizeType())
-    return false;
-
-  if (MD->getNumParams() == 2) {
-    auto *PT = MD->parameters()[1]->getType()->getAs<PointerType>();
-    if (!PT || !PT->isVoidPointerType() ||
-        !PT->getPointeeType().isConstQualified())
-      return false;
-  }
-
-  return true;
-}
-
 void CodeGenFunction::StartFunction(GlobalDecl GD,
                                     QualType RetTy,
                                     llvm::Function *Fn,
@@ -801,14 +782,6 @@ void CodeGenFunction::StartFunction(GlobalDecl GD,
     }
   }
 
-  // Ignore unrelated casts in STL allocate() since the allocator must cast
-  // from void* to T* before object initialization completes. Don't match on the
-  // namespace because not all allocators are in std::
-  if (D && SanOpts.has(SanitizerKind::CFIUnrelatedCast)) {
-    if (matchesStlAllocatorFn(D, getContext()))
-      SanOpts.Mask &= ~SanitizerKind::CFIUnrelatedCast;
-  }
-
   // Apply xray attributes to the function (as a string, for now)
   if (D && ShouldXRayInstrumentFunction()) {
     if (const auto *XRayAttr = D->getAttr<XRayInstrumentAttr>()) {
diff --git a/clang/test/CodeGen/cfi-unrelated-cast.cpp b/clang/test/CodeGen/cfi-unrelated-cast.cpp
deleted file mode 100644
index d01cdf00b754..000000000000
--- a/clang/test/CodeGen/cfi-unrelated-cast.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-// STL allocators should not have unrelated-cast tests applied
-// RUN: %clang_cc1 -flto -triple x86_64-unknown-linux -fvisibility hidden -fsanitize=cfi-unrelated-cast -emit-llvm -o - %s | FileCheck %s
-
-#include <stddef.h>
-
-template<class T>
-class myalloc {
- public:
-  // CHECK: define{{.*}}allocateE{{.}}
-  // CHECK-NOT: llvm.type.test
-  T *allocate(size_t sz) {
-    return (T*)::operator new(sz);
-  }
-
-  // CHECK: define{{.*}}allocateE{{.}}PKv
-  // CHECK-NOT: llvm.type.test
-  T *allocate(size_t sz, const void *ptr) {
-    return (T*)::operator new(sz);
-  }
-
-  // CHECK: define{{.*}}differentName
-  // CHECK: llvm.type.test
-  T *differentName(size_t sz, const void *ptr) {
-    return (T*)::operator new(sz);
-  }
-};
-
-class C1 {
-  virtual void f() {}
-};
-
-C1 *f1() {
-  myalloc<C1> allocator;
-  (void)allocator.allocate(16);
-  (void)allocator.allocate(16, 0);
-  (void)allocator.differentName(16, 0);
-}