diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 827ad7891d33de74c8eb399734dc6df35966153c..84678c960f7ab8775204dca254964237d0355d88 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2010-07-05  Hayato Ito  <hayato@chromium.org>
+
+        Reviewed by NOBODY (OOPS!).
+
+        Rolling out 'page-break-inside:avoid' part of the r54929.
+        Rebased the related layout test, which is now expected to fail, as well.
+
+        https://bugs.webkit.org/show_bug.cgi?id=41532
+
+        * printing/page-break-inside-avoid-expected.txt:
+
 2010-07-04  Peter Kasting  <pkasting@google.com>
 
         Unreviewed.  Update Chromium test expectations.
diff --git a/LayoutTests/printing/page-break-inside-avoid-expected.txt b/LayoutTests/printing/page-break-inside-avoid-expected.txt
index cebbc854b15fcd85b78562d71eb908f57653cd36..3e1db5419fe653410c1ea0174a3e3e01688528b6 100644
--- a/LayoutTests/printing/page-break-inside-avoid-expected.txt
+++ b/LayoutTests/printing/page-break-inside-avoid-expected.txt
@@ -8,13 +8,12 @@ PASS: page number of "page1-1" is 1
 PASS: page number of "page1-2" is 1
 PASS: page number of "page2" is 2
 PASS: page number of "page3" is 3
-PASS: page number of "page4" is 4
+FAIL: expected page number of "page4" is 4. Was 3
 PASS: page number of "page5" is 5
 PASS: page number of "page8" is 8
 PASS: page number of "page9-1" is 9
 PASS: page number of "page9-2" is 9
 PASS: page number of "page10" is 10
-All tests passed
 
 PASS successfullyParsed is true
 
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index ff26ff97ba99b4c5ac7fb7fba4f15ad8509468c7..ae8c19c4dbfd6b729dd50279df438a876c639bd0 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-07-05  Hayato Ito  <hayato@chromium.org>
+
+        Reviewed by NOBODY (OOPS!).
+
+        Rolling out 'page-break-inside:avoid' part of the r54929.
+        Rebased the related layout test, which is now expected to fail, as well.
+
+        https://bugs.webkit.org/show_bug.cgi?id=41532
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::paintChildren):
+
 2010-07-04  Anders Carlsson  <andersca@apple.com>
 
         Fix Windows build.
diff --git a/WebCore/rendering/RenderBlock.cpp b/WebCore/rendering/RenderBlock.cpp
index 116456fe676c26e12545d79d459c7f9e845ec35f..f981108694521ab0f86ec80332e006696bd1d6fd 100644
--- a/WebCore/rendering/RenderBlock.cpp
+++ b/WebCore/rendering/RenderBlock.cpp
@@ -2113,16 +2113,6 @@ void RenderBlock::paintChildren(PaintInfo& paintInfo, int tx, int ty)
             return;
         }
 
-        // Check for page-break-inside: avoid, and it it's set, break and bail.
-        bool checkInsideAvoid = !childrenInline() && ((checkPageBreaks && child->style()->pageBreakInside() == PBAVOID) || (checkColumnBreaks && child->style()->columnBreakInside() == PBAVOID));
-        if (checkInsideAvoid
-            && ty + child->y() > paintInfo.rect.y()
-            && ty + child->y() < paintInfo.rect.bottom()
-            && ty + child->y() + child->height() > paintInfo.rect.bottom()) {
-            view()->setBestTruncatedAt(ty + child->y(), this, true);
-            return;
-        }
-
         if (!child->hasSelfPaintingLayer() && !child->isFloating())
             child->paint(info, tx, ty);