diff --git a/ChangeLog b/ChangeLog
index 4098c468bc..f87f219ea0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Apr 29 10:25:31 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* vm_method.c (rb_clear_cache_by_class): Revert r29673. It made
+	  a segmentation fault regression. [Bug #4289][ruby-core:34554].
+
 Fri Apr 29 10:24:51 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* io.c (make_writeconv): do not add textmode newline decorator if any
diff --git a/vm_method.c b/vm_method.c
index 278941aefa..20873713e6 100644
--- a/vm_method.c
+++ b/vm_method.c
@@ -85,9 +85,6 @@ rb_clear_cache_by_class(VALUE klass)
 {
     struct cache_entry *ent, *end;
 
-    if (RCLASS_M_TBL(klass)->num_entries == 0)
-        return;
-
     rb_vm_change_state();
 
     if (!ruby_running)