diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 08d6fa970..1752775cb 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2005-02-22  Corinna Vinschen  <corinna@vinschen.de>
+
+	* select.cc (peek_pipe): Disable new pipe code until there's
+	a working substitute.
+
 2005-02-22  Corinna Vinschen  <corinna@vinschen.de>
 
 	* cygwin.din (fdatasync): Export.
diff --git a/winsup/cygwin/select.cc b/winsup/cygwin/select.cc
index 3d4a13a16..eb86d7444 100644
--- a/winsup/cygwin/select.cc
+++ b/winsup/cygwin/select.cc
@@ -517,6 +517,10 @@ out:
 		       fh->get_name ());
       else
 	{
+#if 0
+/* FIXME: This code is not quite correct.  There's no better solution
+   so far but to always treat the write side of the pipe as writable. */
+
 	  /* We don't worry about the guard mutex, because that only applies
 	     when from_select is false, and peek_pipe is never called that
 	     way for writes.  */
@@ -563,6 +567,9 @@ out:
 			     fpli.WriteQuotaAvailable);
 	      gotone += s->write_ready = true;
 	    }
+#else
+          gotone += s->write_ready = true;
+#endif
 	}
     }