Index: lib/Format/Format.cpp
===================================================================
--- lib/Format/Format.cpp
+++ lib/Format/Format.cpp
@@ -898,11 +898,6 @@
   } else if (Language == FormatStyle::LK_ObjC) {
     GoogleStyle.AlwaysBreakBeforeMultilineStrings = false;
     GoogleStyle.ColumnLimit = 100;
-    // "Regroup" doesn't work well for ObjC yet (main header heuristic,
-    // relationship between ObjC standard library headers and other heades,
-    // #imports, etc.)
-    GoogleStyle.IncludeStyle.IncludeBlocks =
-        tooling::IncludeStyle::IBS_Preserve;
   }
 
   return GoogleStyle;
Index: unittests/Format/SortIncludesTest.cpp
===================================================================
--- unittests/Format/SortIncludesTest.cpp
+++ unittests/Format/SortIncludesTest.cpp
@@ -653,18 +653,6 @@
   EXPECT_EQ(Code, sort(Code, "input.h", 0));
 }
 
-
-TEST_F(SortIncludesTest, DoNotRegroupGroupsInGoogleObjCStyle) {
-  FmtStyle = getGoogleStyle(FormatStyle::LK_ObjC);
-
-  EXPECT_EQ("#include <a.h>\n"
-            "#include <b.h>\n"
-            "#include \"a.h\"",
-            sort("#include <b.h>\n"
-                 "#include <a.h>\n"
-                 "#include \"a.h\""));
-}
-
 } // end namespace
 } // end namespace format
 } // end namespace clang