diff --git a/ChangeLog b/ChangeLog
index 51e2b242f2..71036dc9e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Mon Dec 24 13:55:35 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* proc.c (rb_proc_new), vm.c (invoke_block): removed u3.state magic.
+	  [ruby-core:14310]
+
+	* test/ruby/test_symbol.rb (test_to_proc): a test from Frederick
+	  Cheung <frederick.cheung AT gmail.com>.
+
 Mon Dec 24 13:43:36 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* thread.c (rb_thread_atfork): should not leave living_threads
diff --git a/proc.c b/proc.c
index a994c3157b..59b0bd3f84 100644
--- a/proc.c
+++ b/proc.c
@@ -1414,10 +1414,7 @@ rb_proc_new(
     VALUE (*func)(ANYARGS), /* VALUE yieldarg[, VALUE procarg] */
     VALUE val)
 {
-    rb_proc_t *proc;
-    VALUE procval = rb_iterate((VALUE(*)(VALUE))mproc, 0, func, val);
-    GetProcPtr(procval, proc);
-    ((NODE*)proc->block.iseq)->u3.state = 1;
+    VALUE procval = rb_iterate(mproc, 0, func, val);
     return procval;
 }
 
@@ -1442,7 +1439,7 @@ method_proc(VALUE method)
      *   end
      * end
      */
-    procval = rb_iterate((VALUE (*)(VALUE))mlambda, 0, bmcall, method);
+    procval = rb_iterate(mlambda, 0, bmcall, method);
     GetProcPtr(procval, proc);
     proc->is_from_method = 1;
     return procval;
diff --git a/test/ruby/test_symbol.rb b/test/ruby/test_symbol.rb
index 2ccfe64c92..f53e615766 100644
--- a/test/ruby/test_symbol.rb
+++ b/test/ruby/test_symbol.rb
@@ -74,4 +74,8 @@ class TestSymbol < Test::Unit::TestCase
     assert_inspect_evaled(':$0')
     assert_inspect_evaled(':$1')
   end
+
+  def test_to_proc
+    assert_equal %w(1 2 3), (1..3).map(&:to_s)
+  end
 end
diff --git a/vm.c b/vm.c
index e630331b7f..e3d7ff4bb8 100644
--- a/vm.c
+++ b/vm.c
@@ -568,11 +568,6 @@ invoke_block(rb_thread_t *th, rb_block_t *block, VALUE self,
 	val = vm_eval_body(th);
     }
     else {
-	if (((NODE*)block->iseq)->u3.state == 1) {
-	    VALUE args = rb_ary_new4(argc, argv);
-	    argc = 1;
-	    argv = &args;
-	}
 	val = vm_yield_with_cfunc(th, block, self, argc, argv);
     }
     return val;