diff --git a/.clang-format b/.clang-format
index 9f8b391e3..f9aa6536d 100644
--- a/.clang-format
+++ b/.clang-format
@@ -3,3 +3,6 @@ BasedOnStyle: Google
 DerivePointerAlignment: false
 PointerAlignment: Left
 SortIncludes: true
+
+# Regroup causes unnecessary noise due to clang-format bug.
+IncludeBlocks: Preserve