Revert "See also webkit.org/b/113415"

Source/core/rendering/RenderBox.cpp

Index: Source/core/rendering/RenderBox.cpp
diff --git a/Source/core/rendering/RenderBox.cpp b/Source/core/rendering/RenderBox.cpp
index 97e85edde618dccb16c4f0300176fbc138f6dae0..be4374f0f8c0a096b77b127b464ca3e2354c2699 100644
--- a/Source/core/rendering/RenderBox.cpp
+++ b/Source/core/rendering/RenderBox.cpp
@@ -4705,11 +4705,6 @@ LayoutRect RenderBox::layoutOverflowRectForPropagation(RenderStyle* parentStyle)
 {
     // Only propagate interior layout overflow if we don't clip it.
     LayoutRect rect = borderBoxRect();
-    // We want to include the margin, but only when it adds height. Quirky margins don't contribute height
-    // nor do the margins of self-collapsing blocks.
-    if (!style()->hasMarginAfterQuirk() && !isSelfCollapsingBlock())
-        rect.expand(isHorizontalWritingMode() ? LayoutSize(LayoutUnit(), marginAfter()) : LayoutSize(marginAfter(), LayoutUnit()));
-
     if (!hasOverflowClip())
         rect.unite(layoutOverflowRect());