diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 30d61c18869f..04e789a472b2 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2005-04-22  Anthony Green  <green@redhat.com>
+
+	* jni.cc (natrehash): Don't bother clearing memory again.
+	* interpret.cc (do_allocate_static_fields): Ditto.
+	* java/lang/natString.cc (rehash): Ditto.
+
 2005-04-22  Roman Kennke  <roman@kennke.org>
 
 	* javax/swing/plaf/basic/BasicLookAndFeel.java
diff --git a/libjava/interpret.cc b/libjava/interpret.cc
index a2bcbb84084b..e7d8992f12c4 100644
--- a/libjava/interpret.cc
+++ b/libjava/interpret.cc
@@ -3751,7 +3751,6 @@ _Jv_InterpreterEngine::do_allocate_static_fields (jclass klass,
   _Jv_InterpClass *iclass = (_Jv_InterpClass *) klass->aux_info;
 
   char *static_data = (char *) _Jv_AllocBytes (static_size);
-  memset (static_data, 0, static_size);
 
   for (int i = 0; i < klass->field_count; i++)
     {
diff --git a/libjava/java/lang/natString.cc b/libjava/java/lang/natString.cc
index e2558f4f7473..6e8febcbcf67 100644
--- a/libjava/java/lang/natString.cc
+++ b/libjava/java/lang/natString.cc
@@ -125,7 +125,6 @@ rehash ()
     {
       strhash_size = 1024;
       strhash = (jstring *) _Jv_AllocBytes (strhash_size * sizeof (jstring));
-      memset (strhash, 0, strhash_size * sizeof (jstring));
     }
   else
     {
@@ -133,7 +132,6 @@ rehash ()
       jstring* ptr = strhash + i;
       int nsize = strhash_size * 2;
       jstring *next = (jstring *) _Jv_AllocBytes (nsize * sizeof (jstring));
-      memset (next, 0, nsize * sizeof (jstring));
 
       while (--i >= 0)
 	{
diff --git a/libjava/jni.cc b/libjava/jni.cc
index b68c3bb887f0..cf4d04750444 100644
--- a/libjava/jni.cc
+++ b/libjava/jni.cc
@@ -1847,7 +1847,6 @@ natrehash ()
       nathash =
 	(JNINativeMethod *) _Jv_AllocBytes (nathash_size
 					    * sizeof (JNINativeMethod));
-      memset (nathash, 0, nathash_size * sizeof (JNINativeMethod));
     }
   else
     {
@@ -1857,7 +1856,6 @@ natrehash ()
       nathash =
 	(JNINativeMethod *) _Jv_AllocBytes (nathash_size
 					    * sizeof (JNINativeMethod));
-      memset (nathash, 0, nathash_size * sizeof (JNINativeMethod));
 
       for (int i = 0; i < savesize; ++i)
 	{