diff --git a/gfx/layers/basic/BasicLayers.cpp b/gfx/layers/basic/BasicLayers.cpp
index 6334e4b6d7b..3a8252f2f28 100644
--- a/gfx/layers/basic/BasicLayers.cpp
+++ b/gfx/layers/basic/BasicLayers.cpp
@@ -763,9 +763,7 @@ BasicThebesLayer::PaintThebes(gfxContext* aContext,
   if (BasicManager()->IsTransactionIncomplete())
     return;
 
-  gfxRect clipExtents;
-  clipExtents = aContext->GetClipExtents();
-  if (!IsHidden() && clipExtents.IsEmpty()) {
+  if (!IsHidden()) {
     AutoSetOperator setOperator(aContext, GetOperator());
     mBuffer.DrawTo(this, aContext, opacity);
   }
@@ -1948,22 +1946,16 @@ BasicLayerManager::PaintLayer(gfxContext* aTarget,
       NS_ABORT_IF_FALSE(untransformedSurface, 
                         "We should always allocate an untransformed surface with 3d transforms!");
 
-      // Temporary fast fix for bug 725886
-      // Revert these changes when 725886 is ready
-      gfxRect clipExtents;
-      clipExtents = aTarget->GetClipExtents();
-      if (!clipExtents.IsEmpty()) {
-        gfxPoint offset;
-        bool dontBlit = needsClipToVisibleRegion || mTransactionIncomplete ||
-                          aLayer->GetEffectiveOpacity() != 1.0f;
-        nsRefPtr<gfxASurface> result =
-          Transform3D(untransformedSurface, aTarget, bounds,
-                      effectiveTransform, offset, dontBlit);
+      gfxPoint offset;
+      bool dontBlit = needsClipToVisibleRegion || mTransactionIncomplete || 
+                        aLayer->GetEffectiveOpacity() != 1.0f;
+      nsRefPtr<gfxASurface> result = 
+        Transform3D(untransformedSurface, aTarget, bounds,
+                    effectiveTransform, offset, dontBlit);
 
-        blitComplete = !result;
-        if (result) {
-          aTarget->SetSource(result, offset);
-        }
+      blitComplete = !result;
+      if (result) {
+        aTarget->SetSource(result, offset);
       }
     }
     // If we're doing our own double-buffering, we need to avoid drawing
diff --git a/widget/xpwidgets/PuppetWidget.cpp b/widget/xpwidgets/PuppetWidget.cpp
index 1657802dfb9..9327c6deff9 100644
--- a/widget/xpwidgets/PuppetWidget.cpp
+++ b/widget/xpwidgets/PuppetWidget.cpp
@@ -530,8 +530,6 @@ PuppetWidget::DispatchPaintEvent()
       DispatchEvent(&event, status);
     } else {
       nsRefPtr<gfxContext> ctx = new gfxContext(mSurface);
-      ctx->Rectangle(gfxRect(0,0,0,0));
-      ctx->Clip();
       AutoLayerManagerSetup setupLayerManager(this, ctx,
                                               BasicLayerManager::BUFFER_NONE);
       DispatchEvent(&event, status);