diff --git a/ChangeLog b/ChangeLog
index 08c4a95fb..3338ab0dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -173,6 +173,9 @@
      [nchan.c]
      correct fn names for ssh2, do not switch from closed to closed; 
      ok provos@
+   - markus@cvs.openbsd.org 2002/01/14 13:41:13
+     [nchan.c]
+     remove duplicated code; ok provos@
 
 20020121
  - (djm) Rework ssh-rand-helper:
@@ -7320,4 +7323,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1771 2002/01/22 12:28:13 djm Exp $
+$Id: ChangeLog,v 1.1772 2002/01/22 12:28:28 djm Exp $
diff --git a/nchan.c b/nchan.c
index 8b793714e..9ecf42105 100644
--- a/nchan.c
+++ b/nchan.c
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: nchan.c,v 1.40 2002/01/14 13:40:10 markus Exp $");
+RCSID("$OpenBSD: nchan.c,v 1.41 2002/01/14 13:41:13 markus Exp $");
 
 #include "ssh1.h"
 #include "ssh2.h"
@@ -324,9 +324,6 @@ chan_write_failed2(Channel *c)
 	debug("channel %d: write failed", c->self);
 	switch (c->ostate) {
 	case CHAN_OUTPUT_OPEN:
-		chan_shutdown_write(c); /* ?? */
-		chan_set_ostate(c, CHAN_OUTPUT_CLOSED);
-		break;
 	case CHAN_OUTPUT_WAIT_DRAIN:
 		chan_shutdown_write(c);
 		chan_set_ostate(c, CHAN_OUTPUT_CLOSED);