diff --git a/ChangeLog b/ChangeLog
index c6979e0e87..30468466c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Dec  5 15:25:55 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (rb_intern3): fix to changing encoding to default, and
+	  uncommented r13835, which is rare but not impossible.
+
 Wed Dec  5 15:15:21 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* range.c (step_i, range_step): support non-fixnum steps.
diff --git a/parse.y b/parse.y
index 43d45c6826..03bbb3bd36 100644
--- a/parse.y
+++ b/parse.y
@@ -8876,31 +8876,19 @@ rb_intern3(const char *name, long len, rb_encoding *enc)
 	}
     }
     if (m - name < len) id = ID_JUNK;
-    /*
-     * davidflanagan: commented out because this just doesn't make sense.
-     *
-     * If we were called with a non-ascii encoding, then change
-     * the encoding to ASCII, unless the symbol had multi-byte characters
-     * and there are trailing non-identifier characters that are 
-     * outside of ASCII. But all multi-byte characters
-     * are identifier chars, so there will never be trailing characters
-     * so this clause always changes the encoding of the string.
-     *
-     * The upshot is that the symbol is placed in the hashtable with
-     * an ASCII encoding, but is queried (at the top of this function)
-     * with its real encoding.  So :x == :x is false when x is a
-     * multi-byte character. 
-     *
-    if (enc != rb_enc_from_index(0)) {
+    if (enc != rb_default_encoding()) {
+	/*
+	 * this clause makes sense only when called from other than
+	 * rb_intern_str() taking care of code-range.
+	 */
 	if (!mb) {
 	    for (; m <= name + len; ++m) {
 		if (!ISASCII(*m)) goto mbstr;
 	    }
+	    enc = rb_default_encoding();
 	}
-	enc = rb_enc_from_index(0);
       mbstr:;
     }
-    */
   new_id:
     id |= ++global_symbols.last_id << ID_SCOPE_SHIFT;
   id_register: