diff --git a/clang/lib/CodeGen/ObjectFilePCHContainerOperations.cpp b/clang/lib/CodeGen/ObjectFilePCHContainerOperations.cpp
index d03e5bd508731a..9fe7e5d1f5c31f 100644
--- a/clang/lib/CodeGen/ObjectFilePCHContainerOperations.cpp
+++ b/clang/lib/CodeGen/ObjectFilePCHContainerOperations.cpp
@@ -96,10 +96,6 @@ class PCHContainerGenerator : public ASTConsumer {
     }
 
     bool VisitFunctionDecl(FunctionDecl *D) {
-      // Skip deduction guides.
-      if (isa<CXXDeductionGuideDecl>(D))
-        return true;
-
       if (isa<CXXMethodDecl>(D))
         // This is not yet supported. Constructing the `this' argument
         // mandates a CodeGenFunction.
diff --git a/clang/test/Modules/Inputs/gmodules-deduction-guide.h b/clang/test/Modules/Inputs/gmodules-deduction-guide.h
deleted file mode 100644
index 47b5931083af1c..00000000000000
--- a/clang/test/Modules/Inputs/gmodules-deduction-guide.h
+++ /dev/null
@@ -1,11 +0,0 @@
-struct A {
-};
-
-template <class T>
-struct S{
-  S(const A &);
-};
-
-S(const A&) -> S<A>;
-
-typedef decltype(S(A())) Type0;
diff --git a/clang/test/Modules/gmodules-deduction-guide.cpp b/clang/test/Modules/gmodules-deduction-guide.cpp
deleted file mode 100644
index 1017b76c82875e..00000000000000
--- a/clang/test/Modules/gmodules-deduction-guide.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-// RUN: %clang_cc1 -std=c++2b -x c++-header -emit-pch -fmodule-format=obj -I %S/Inputs \
-// RUN:   -o %t.pch %S/Inputs/gmodules-deduction-guide.h \
-// RUN:   -mllvm -debug-only=pchcontainer &>%t-pch.ll
-// RUN: cat %t-pch.ll | FileCheck %s
-
-// CHECK: ![[V0:.*]] = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "S<A>",
-// CHECK: !DIDerivedType(tag: DW_TAG_typedef, name: "Type0",{{.*}}, baseType: ![[V0]])