diff --git a/ChangeLog b/ChangeLog
index 1abd2128e..82280ea3b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2012-01-21  Eric Wasylishen  <ewasylishen@gmail.com>
+
+	* Source/NSView.m (-setBounds:, -setBoundsOrigin:, -setBoundsSize:):
+	Revert a portion of r32955 which I committed last april but I now
+	see was a mistake, and I just discovered is breaking the  copy-on-scroll
+	behaviour of NSClipView - we end up always redrawing the entire visible
+	portion of the document view right now.
+
+	In r32955 I added [self setNeedsDisplay: YES] calls to these methods
+	even though these are documented explicitly as not marking the view for
+	needing display. Approved by Fred for commit during the code freeze.
+
 2012-01-20 German Arias <german@xelalug.org>
 
 	* Source/GSInfoPanel.m (-initWithDictionary:): Fix bug #35335.
diff --git a/Source/NSView.m b/Source/NSView.m
index bc65d0f08..4d740bc57 100644
--- a/Source/NSView.m
+++ b/Source/NSView.m
@@ -1447,10 +1447,6 @@ static NSSize _computeScale(NSSize fs, NSSize bs)
               object: self];
         }
     }
-
-  // FIXME: Should not be called here according to Cocoa docs, but 
-  // Cocoa seems to in practice
-  [self setNeedsDisplay: YES];
 }
 
 - (void) setBoundsOrigin: (NSPoint)newOrigin
@@ -1471,10 +1467,6 @@ static NSSize _computeScale(NSSize fs, NSSize bs)
     }
   [self translateOriginToPoint: NSMakePoint(oldOrigin.x - newOrigin.x, 
                                             oldOrigin.y - newOrigin.y)];
-
-  // FIXME: Should not be called here according to Cocoa docs, but 
-  // Cocoa seems to in practice
-  [self setNeedsDisplay: YES];
 }
 
 - (void) setBoundsSize: (NSSize)newSize
@@ -1535,10 +1527,6 @@ static NSSize _computeScale(NSSize fs, NSSize bs)
       [nc postNotificationName: NSViewBoundsDidChangeNotification
                         object: self];
     }
-  
-  // FIXME: Should not be called here according to Cocoa docs, but 
-  // Cocoa seems to in practice
-  [self setNeedsDisplay: YES];
 }
 
 - (void) setBoundsRotation: (CGFloat)angle