diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index c924e075724..151c76ff8af 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2003-09-25  Michael Koch  <konqueror@gmx.de>
+
+	* java/lang/reflect/Proxy.java
+	(getProxyClass): Remove workaround for gcj 3.0.x.
+
 2003-09-25  Michael Koch  <konqueror@gmx.de>
 
 	* gnu/java/net/PlainDatagramSocketImpl.java
diff --git a/libjava/java/lang/reflect/Proxy.java b/libjava/java/lang/reflect/Proxy.java
index 9009bc8031b..03b2a45645c 100644
--- a/libjava/java/lang/reflect/Proxy.java
+++ b/libjava/java/lang/reflect/Proxy.java
@@ -269,18 +269,9 @@ public class Proxy implements Serializable
                               ? getProxyData0(loader, interfaces)
                               : ProxyData.getProxyData(pt));
 
-            // FIXME workaround for bug in gcj 3.0.x
-            // Not needed with the latest gcj from cvs
-            //clazz = (Configuration.HAVE_NATIVE_GENERATE_PROXY_CLASS
-            //	       ? generateProxyClass0(loader, data)
-            //         : new ClassFactory(data).generate(loader));
-            if (Configuration.HAVE_NATIVE_GENERATE_PROXY_CLASS)
-              clazz = generateProxyClass0(loader, data);
-            else
-              {
-                ClassFactory cf = new ClassFactory(data);
-                clazz = cf.generate(loader);
-              }
+            clazz = (Configuration.HAVE_NATIVE_GENERATE_PROXY_CLASS
+		     ? generateProxyClass0(loader, data)
+                     : new ClassFactory(data).generate(loader));
           }
 
         Object check = proxyClasses.put(pt, clazz);