diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 2fdb5b2c1..b1b0dde60 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2009-06-29  Christopher Faylor  <me+cygwin@cgf.cx>
+
+	* select.cc (peek_pipe): Turn on (temporarily?) the experimental code
+	which tries to determine when a pipe is writable.
+
 2009-06-28  Christopher Faylor  <me+cygwin@cgf.cx>
 
 	* select.cc (peek_pipe): Use has_ongoing_io() to determine if the pipe
diff --git a/winsup/cygwin/select.cc b/winsup/cygwin/select.cc
index e9dac26ce..2b1d6c438 100644
--- a/winsup/cygwin/select.cc
+++ b/winsup/cygwin/select.cc
@@ -517,10 +517,6 @@ out:
 	s->write_ready = false;
       else
 	{
-#if 0
-/* FIXME: This code is not quite correct.  There's no better solution
-   so far but to make simple assumptions based on WriteQuotaAvailable. */
-
 	  IO_STATUS_BLOCK iosb = {0};
 	  FILE_PIPE_LOCAL_INFORMATION fpli = {0};
 
@@ -562,9 +558,6 @@ out:
 			     fpli.WriteQuotaAvailable);
 	      gotone += s->write_ready = true;
 	    }
-#else
-	  gotone += s->write_ready = true;
-#endif
 	}
     }