diff --git a/clang/lib/CodeGen/BackendUtil.cpp b/clang/lib/CodeGen/BackendUtil.cpp
index 4fdffdeae416..bac1e89820a8 100644
--- a/clang/lib/CodeGen/BackendUtil.cpp
+++ b/clang/lib/CodeGen/BackendUtil.cpp
@@ -689,11 +689,9 @@ void EmitAssemblyHelper::EmitAssembly(BackendAction Action,
     break;
 
   case Backend_EmitBC:
-    if (CodeGenOpts.EmitSummaryIndex)
-      PerModulePasses.add(createWriteThinLTOBitcodePass(*OS));
-    else
-      PerModulePasses.add(
-          createBitcodeWriterPass(*OS, CodeGenOpts.EmitLLVMUseLists));
+    PerModulePasses.add(createBitcodeWriterPass(
+        *OS, CodeGenOpts.EmitLLVMUseLists, CodeGenOpts.EmitSummaryIndex,
+        CodeGenOpts.EmitSummaryIndex));
     break;
 
   case Backend_EmitLL:
diff --git a/clang/test/CMakeLists.txt b/clang/test/CMakeLists.txt
index 6e6acb72ab2b..e3371994aedb 100644
--- a/clang/test/CMakeLists.txt
+++ b/clang/test/CMakeLists.txt
@@ -80,7 +80,6 @@ if( NOT CLANG_BUILT_STANDALONE )
     llc
     llvm-bcanalyzer
     llvm-dis
-    llvm-modextract
     llvm-nm
     llvm-objdump
     llvm-profdata
diff --git a/clang/test/CodeGenCXX/type-metadata-thinlto.cpp b/clang/test/CodeGenCXX/type-metadata-thinlto.cpp
deleted file mode 100644
index 2a586fc4c37c..000000000000
--- a/clang/test/CodeGenCXX/type-metadata-thinlto.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-// RUN: %clang_cc1 -flto=thin -flto-unit -triple x86_64-unknown-linux -fvisibility hidden -emit-llvm-bc -o %t %s
-// RUN: llvm-modextract -o - -n 1 %t | llvm-dis | FileCheck %s
-
-// CHECK: @_ZTV1A = linkonce_odr
-class A {
-  virtual void f() {}
-};
-
-A *f() {
-  return new A;
-}