diff --git a/ChangeLog b/ChangeLog
index b1c72d6bcb..b691e5c87b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Sep  9 03:59:13 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (make_writeconv): useless branch removed.
+
 Tue Sep  9 02:18:20 2008  Tanaka Akira  <akr@fsij.org>
 
 	* include/ruby/encoding.h (rb_econv_decorate_at_first): declared.
diff --git a/io.c b/io.c
index d45018615b..93447db53b 100644
--- a/io.c
+++ b/io.c
@@ -729,14 +729,6 @@ make_writeconv(rb_io_t *fptr)
                     denc = enc->name;
                     fptr->writeconv_stateless = rb_str_new2(senc);
                 }
-                else if ((fptr->encs.ecflags & ECONV_STATEFUL_ENCODER_MASK) && !rb_enc_asciicompat(enc)) {
-                    /* xxx: stateful encoder works for ASCII compatible encoding.
-                     * So we need to choose an encoding which is ASCII compatible and superset of enc.
-                     * For encodings which is superset of UTF-8, UTF-8 is not appropriate choice.  */
-                    senc = "UTF-8";
-                    denc = enc->name;
-                    fptr->writeconv_stateless = rb_str_new2("UTF-8");
-                }
                 else {
                     senc = denc = "";
                     fptr->writeconv_stateless = rb_str_new2(enc->name);