diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 7125e0d6b2a..bed53ea01af 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2000-12-18  Bryce McKinlay  <bryce@albatross.co.nz>
+
+	* java/awt/Window.java (addNotify): Remove peer casting hack now that 
+	gcj/312 is fixed.
+
 2000-12-18  Joseph S. Myers  <jsm28@cam.ac.uk>
 
 	* COPYING: Update to current
diff --git a/libjava/java/awt/Window.java b/libjava/java/awt/Window.java
index b06eff0548a..d56e8aa8183 100644
--- a/libjava/java/awt/Window.java
+++ b/libjava/java/awt/Window.java
@@ -102,8 +102,7 @@ public class Window extends Container
   public void addNotify()
   {
     if (peer == null)
-      // FIXME: This cast should NOT be required. ??? Compiler bug ???
-      peer = (ComponentPeer) getToolkit ().createWindow (this);
+      peer = getToolkit ().createWindow (this);
     super.addNotify ();
   }