diff --git a/lib/Format/Format.cpp b/lib/Format/Format.cpp
index beea48e..1ab5770 100644
--- a/lib/Format/Format.cpp
+++ b/lib/Format/Format.cpp
@@ -812,10 +812,6 @@
           TT_LineComment || (Current.is(tok::string_literal) &&
                              Current.Parent->is(tok::string_literal))) {
         Current.MustBreakBefore = true;
-      } else if (Current.is(tok::at) && Current.Parent->Parent->is(tok::at)) {
-        // Don't put two objc's '@' on the same line. This could happen,
-        // as in, @optional @property ...
-        Current.MustBreakBefore = true;
       } else {
         Current.MustBreakBefore = false;
       }
diff --git a/unittests/Format/FormatTest.cpp b/unittests/Format/FormatTest.cpp
index 9ed6b5f..389c58c 100644
--- a/unittests/Format/FormatTest.cpp
+++ b/unittests/Format/FormatTest.cpp
@@ -1347,6 +1347,8 @@
                "- (void)optional;\n"
                "@required\n"
                "- (void)required;\n"
+               "@optional\n"
+               "@property(assign) int madProp;\n"
                "@end\n");
 }