diff --git a/lldb/.clang-format b/lldb/.clang-format
index c698dc5d99cf..9b3aa8b7213b 100644
--- a/lldb/.clang-format
+++ b/lldb/.clang-format
@@ -1,9 +1 @@
 BasedOnStyle: LLVM
-IndentWidth:     4
-ColumnLimit:     120
-BreakBeforeBraces: Allman
-AlwaysBreakAfterReturnType: All
-AllowShortFunctionsOnASingleLine: Inline
-ConstructorInitializerAllOnOneLineOrOnePerLine: true
-IndentCaseLabels: true
-AccessModifierOffset: -4
diff --git a/lldb/packages/Python/lldbsuite/.clang-format b/lldb/packages/Python/lldbsuite/.clang-format
new file mode 100644
index 000000000000..7de7a512ad7e
--- /dev/null
+++ b/lldb/packages/Python/lldbsuite/.clang-format
@@ -0,0 +1,4 @@
+DisableFormat: true
+
+# Disabling formatting doesn't implicitly disable include sorting
+SortIncludes: false