diff --git a/ChangeLog b/ChangeLog
index f753bb83b9..c7cf0e0595 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
-Mon Aug  6 11:34:33 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Aug  6 13:13:58 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_eval.c (vm_call_super): since cfp->klass is always class or
+	  iclass, no search from method entry.
 
 	* insns.def (defined): now should use klass in the current control
 	  frame to search superclass, not me->klass.  reported by naruse.
diff --git a/vm_eval.c b/vm_eval.c
index 05d5d883b9..6b01cc3708 100644
--- a/vm_eval.c
+++ b/vm_eval.c
@@ -162,10 +162,6 @@ vm_call_super(rb_thread_t *th, int argc, const VALUE *argv)
 
     if (!cfp->iseq && !NIL_P(cfp->klass)) {
 	klass = RCLASS_SUPER(cfp->klass);
-
-	if (klass == 0) {
-	    klass = vm_search_normal_superclass(cfp->me->klass);
-	}
 	id = cfp->me->def->original_id;
     }
     else {