diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index b13a65a..2106d25 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,5 +1,21 @@
 2009-02-26  Mark Rowe  <mrowe@apple.com>
 
+        Merge r41070.
+
+    2009-02-18  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Fix for <rdar://problem/6542390>
+
+        There's no need to call setDefersLoading here - we already defer anything a plug-in can do that
+        would cause a load to begin.
+
+        * Plugins/WebNetscapePluginView.mm:
+        (-[WebNetscapePluginView sendEvent:isDrawRect:]):
+
+2009-02-26  Mark Rowe  <mrowe@apple.com>
+
         Merge r41190.
 
     2009-02-24  Sam Weinig  <sam@webkit.org>
diff --git a/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm b/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm
index 5696298..91f3bda 100644
--- a/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm
+++ b/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm
@@ -734,10 +734,6 @@
     if (!page)
         return NO;
 
-    bool wasDeferring = page->defersLoading();
-    if (!wasDeferring)
-        page->setDefersLoading(true);
-
     // Can only send updateEvt to CoreGraphics and OpenGL plugins when actually drawing
     ASSERT((drawingModel != NPDrawingModelCoreGraphics && drawingModel != NPDrawingModelOpenGL) || event->what != updateEvt || [NSView focusView] == self);
     
@@ -784,9 +780,6 @@
         free(portState);
     }
 
-    if (!wasDeferring)
-        page->setDefersLoading(false);
-            
     return acceptedEvent;
 }