diff --git a/ChangeLog b/ChangeLog
index ed4023050..6db76649b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-09-24 Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Headers/Additions/GNUstepGUI/GSDisplayServer.h:
+	* Source/GSDisplayServer.m: Revert unnecessary addition to api
+	* Source/NSWindow.m: Use ([flushwindowrect::]) for expose events.
+
 2006-09-23  Matt Rice <ratmice@yahoo.com>
 
 	* Source/NSTableView.m (_isCellEditableColumn:row:): Allow
diff --git a/Headers/Additions/GNUstepGUI/GSDisplayServer.h b/Headers/Additions/GNUstepGUI/GSDisplayServer.h
index d75770c4e..b6421c546 100644
--- a/Headers/Additions/GNUstepGUI/GSDisplayServer.h
+++ b/Headers/Additions/GNUstepGUI/GSDisplayServer.h
@@ -143,7 +143,6 @@ APPKIT_EXPORT NSString * GSScreenNumber;
 - (void) styleoffsets: (float*) l : (float*) r : (float*) t : (float*) b 
                      : (unsigned int) style;
 - (void) docedited: (int) edited : (int) win;
-- (void) exposewindow: (NSRect)frame : (int) win;
 - (void) setinputstate: (int)state : (int)win;
 - (void) setinputfocus: (int) win;
 - (void) setalpha: (float)alpha: (int) win;
diff --git a/Source/GSDisplayServer.m b/Source/GSDisplayServer.m
index 986070083..84a452316 100644
--- a/Source/GSDisplayServer.m
+++ b/Source/GSDisplayServer.m
@@ -724,12 +724,6 @@ GSCurrentServer(void)
   [self subclassResponsibility: _cmd];
 }
 
-/** Repaint an exposed region of a buffered window */
-- (void) exposewindow: (NSRect)frame : (int) win
-{
-  [self subclassResponsibility: _cmd];
-}
-
 /** Sets the input state for the window given by the
     GSWindowInputState constant.  Instructs the window manager that the
     specified window is 'key', 'main', or just a normal window.  */
diff --git a/Source/NSWindow.m b/Source/NSWindow.m
index 32e407114..f6fad98f5 100644
--- a/Source/NSWindow.m
+++ b/Source/NSWindow.m
@@ -3375,7 +3375,7 @@ resetCursorRectsForView(NSView *theView)
 		       * backend to have a copy of the region contents and
 		       * be able to draw it.
 		       */
-		      [GSServerForWindow(self) exposewindow: region
+		      [GSServerForWindow(self) flushwindowrect: region
 			: _windowNum];
 		      break;