diff --git a/cross-project-tests/lit.cfg.py b/cross-project-tests/lit.cfg.py
--- a/cross-project-tests/lit.cfg.py
+++ b/cross-project-tests/lit.cfg.py
@@ -75,7 +75,7 @@
 # Facebook T92898286
 should_test_bolt = get_required_attr(config, "llvm_test_bolt")
 if should_test_bolt:
-    llvm_config.use_clang(required=('clang' in config.llvm_enabled_projects), additional_flags=['--post-link-optimize', '-fdebug-default-version=4'])
+    llvm_config.use_clang(required=('clang' in config.llvm_enabled_projects), additional_flags=['--post-link-optimize'])
 else:
     llvm_config.use_clang(required=('clang' in config.llvm_enabled_projects))
 # End Facebook T92898286
diff --git a/lldb/test/API/lit.cfg.py b/lldb/test/API/lit.cfg.py
--- a/lldb/test/API/lit.cfg.py
+++ b/lldb/test/API/lit.cfg.py
@@ -205,8 +205,7 @@
 
 # Facebook T92898286
 if is_configured("llvm_test_bolt"):
-    dotest_cmd += ['-E', '"--post-link-optimize"',
-                   '-E', '"-fdebug-default-version=4"']
+    dotest_cmd += ['-E', '"--post-link-optimize"']
 # End Facebook T92898286
 
 if 'lldb-repro-capture' in config.available_features or \
diff --git a/lldb/test/Shell/helper/toolchain.py b/lldb/test/Shell/helper/toolchain.py
--- a/lldb/test/Shell/helper/toolchain.py
+++ b/lldb/test/Shell/helper/toolchain.py
@@ -140,7 +140,7 @@
 
     # Facebook T92898286
     if config.llvm_test_bolt:
-        host_flags += ['--post-link-optimize', '-fdebug-default-version=4']
+        host_flags += ['--post-link-optimize']
     # End Facebook T92898286
 
     host_flags = ' '.join(host_flags)