diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 715b31ff4..d0a9167e7 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2004-06-17  Corinna Vinschen  <corinna@vinschen.de>
+
+	* fhandler.cc (fhandler_base::open): Remove 9x specific code.
+
 2004-06-17  Pierre Humblet <pierre.humblet@ieee.org>
  
 	* fhandler.cc (fhandler_base::open_9x): Do not check for null name.
diff --git a/winsup/cygwin/fhandler.cc b/winsup/cygwin/fhandler.cc
index 1ea719405..57a3c4712 100644
--- a/winsup/cygwin/fhandler.cc
+++ b/winsup/cygwin/fhandler.cc
@@ -632,15 +632,6 @@ fhandler_base::open (int flags, mode_t mode)
 			 create_disposition, create_options, NULL, 0);
   if (!NT_SUCCESS (status))
     {
-      if (!wincap.can_open_directories () && pc.isdir ())
-	{
-	  if (flags & (O_CREAT | O_EXCL) == (O_CREAT | O_EXCL))
-	    set_errno (EEXIST);
-	  else if (flags & (O_WRONLY | O_RDWR))
-	    set_errno (EISDIR);
-	  else
-	    nohandle (true);
-	}
       __seterrno_from_win_error (RtlNtStatusToDosError (status));
       if (!nohandle ())
 	goto done;