diff --git a/src/tools/clangpchmanagerbackend/source/generatepchactionfactory.h b/src/tools/clangpchmanagerbackend/source/generatepchactionfactory.h
index 2b1f4d036da..26d9b760bf6 100644
--- a/src/tools/clangpchmanagerbackend/source/generatepchactionfactory.h
+++ b/src/tools/clangpchmanagerbackend/source/generatepchactionfactory.h
@@ -46,7 +46,6 @@ public:
     {
         compilerInstance.getPreprocessorOpts().DisablePCHValidation = true;
         compilerInstance.getPreprocessorOpts().AllowPCHWithCompilerErrors = true;
-        compilerInstance.getLangOpts().DelayedTemplateParsing = true;
         compilerInstance.getDiagnosticOpts().ErrorLimit = 0;
         std::unique_ptr<llvm::MemoryBuffer> Input = llvm::MemoryBuffer::getMemBuffer(m_fileContent);
         compilerInstance.getPreprocessorOpts().addRemappedFile(m_filePath, Input.release());
diff --git a/src/tools/clangrefactoringbackend/source/symbolscollector.cpp b/src/tools/clangrefactoringbackend/source/symbolscollector.cpp
index 84aff74d5f7..b4bafcc8ada 100644
--- a/src/tools/clangrefactoringbackend/source/symbolscollector.cpp
+++ b/src/tools/clangrefactoringbackend/source/symbolscollector.cpp
@@ -101,7 +101,6 @@ newFrontendActionFactory(Factory *consumerFactory,
         protected:
             bool BeginInvocation(clang::CompilerInstance &compilerInstance) override
             {
-                compilerInstance.getLangOpts().DelayedTemplateParsing = false;
                 compilerInstance.getPreprocessorOpts().AllowPCHWithCompilerErrors = true;
 
                 return clang::ASTFrontendAction::BeginInvocation(compilerInstance);