diff --git a/ChangeLog b/ChangeLog
index 5ff01b2977..03029ea7d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon Jan 25 22:08:20 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* cont.c (rb_cont_call, cont_restore_1): remove trap_tag check because
+	  it seems not to make sense.  [ruby-dev:40121]
+
+	* vm_core.h, eval.c (rb_protect): ditto.
+
 Mon Jan 25 21:43:05 2010  Yusuke Endoh  <mame@tsg.ne.jp>
 
 	* test/ruby/envutil.rb: fix the check if instance method `ruby' is
diff --git a/cont.c b/cont.c
index a77f35e6d2..932b10e2dc 100644
--- a/cont.c
+++ b/cont.c
@@ -388,7 +388,6 @@ cont_restore_1(rb_context_t *cont)
     th->state = sth->state;
     th->status = sth->status;
     th->tag = sth->tag;
-    th->trap_tag = sth->trap_tag;
     th->errinfo = sth->errinfo;
     th->first_proc = sth->first_proc;
 
@@ -621,9 +620,6 @@ rb_cont_call(int argc, VALUE *argv, VALUE contval)
     if (cont->saved_thread.self != th->self) {
 	rb_raise(rb_eRuntimeError, "continuation called across threads");
     }
-    if (cont->saved_thread.trap_tag != th->trap_tag) {
-	rb_raise(rb_eRuntimeError, "continuation called across trap");
-    }
     if (cont->saved_thread.fiber) {
 	rb_fiber_t *fcont;
 	GetFiberPtr(cont->saved_thread.fiber, fcont);
@@ -940,9 +936,6 @@ fiber_switch(VALUE fibval, int argc, VALUE *argv, int is_resume)
     if (cont->saved_thread.self != th->self) {
 	rb_raise(rb_eFiberError, "fiber called across threads");
     }
-    else if (cont->saved_thread.trap_tag != th->trap_tag) {
-	rb_raise(rb_eFiberError, "fiber called across trap");
-    }
     else if (fib->status == TERMINATED) {
 	value = rb_exc_new2(rb_eFiberError, "dead fiber called");
 	if (th->fiber != fibval) rb_exc_raise(value);
diff --git a/eval.c b/eval.c
index f60a7e4a5a..ffc924edce 100644
--- a/eval.c
+++ b/eval.c
@@ -690,19 +690,14 @@ rb_protect(VALUE (* proc) (VALUE), VALUE data, int * state)
     int status;
     rb_thread_t *th = GET_THREAD();
     rb_control_frame_t *cfp = th->cfp;
-    struct rb_vm_trap_tag trap_tag;
     rb_jmpbuf_t org_jmpbuf;
 
-    trap_tag.prev = th->trap_tag;
-
     PUSH_TAG();
-    th->trap_tag = &trap_tag;
     MEMCPY(&org_jmpbuf, &(th)->root_jmpbuf, rb_jmpbuf_t, 1);
     if ((status = EXEC_TAG()) == 0) {
 	SAVE_ROOT_JMPBUF(th, result = (*proc) (data));
     }
     MEMCPY(&(th)->root_jmpbuf, &org_jmpbuf, rb_jmpbuf_t, 1);
-    th->trap_tag = trap_tag.prev;
     POP_TAG();
 
     if (state) {
diff --git a/vm_core.h b/vm_core.h
index deda8b6995..705df82b18 100644
--- a/vm_core.h
+++ b/vm_core.h
@@ -347,10 +347,6 @@ struct rb_vm_tag {
     struct rb_vm_tag *prev;
 };
 
-struct rb_vm_trap_tag {
-    struct rb_vm_trap_tag *prev;
-};
-
 #define RUBY_VM_VALUE_CACHE_SIZE 0x1000
 #define USE_VALUE_CACHE 0
 
@@ -414,7 +410,6 @@ typedef struct rb_thread_struct
     int transition_for_lock;
 
     struct rb_vm_tag *tag;
-    struct rb_vm_trap_tag *trap_tag;
 
     int parse_in_eval;
     int mild_compile_error;