diff --git a/ChangeLog b/ChangeLog
index ba96d5eb19..7016dc7281 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,12 @@
+Wed Aug  3 08:22:13 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/socket/socket.c (ruby_connect): revert [ruby-talk:111654]
+	  changes at 2004-09-07.  [ruby-dev:26656]
+
 Wed Aug  3 06:53:35 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* array.c (rb_ary_or): wraps the operand in an array if it is not
-	  an array.  [ruby-talk:150495]
+	  an array.  [ruby-talk:150495] [EXPERIMENTAL]
 
 	* array.c (rb_ary_and, rb_ary_plus, rb_ary_diff): ditto.
 
diff --git a/ext/socket/socket.c b/ext/socket/socket.c
index b870677aab..ca805e5ec3 100644
--- a/ext/socket/socket.c
+++ b/ext/socket/socket.c
@@ -1012,9 +1012,7 @@ ruby_connect(fd, sockaddr, len, socks)
     int socks;
 {
     int status;
-#if defined(HAVE_FCNTL)
     int mode;
-#endif
 #if WAIT_IN_PROGRESS > 0
     int wait_in_progress = -1;
     int sockerr, sockerrlen;
@@ -1058,9 +1056,6 @@ ruby_connect(fd, sockaddr, len, socks)
 #ifdef EINPROGRESS
 	      case EINPROGRESS:
 #endif
-#if defined(HAVE_FCNTL)
-		if (mode & NONBLOCKING) break;
-#endif
 #if WAIT_IN_PROGRESS > 0
 		sockerrlen = sizeof(sockerr);
 		status = getsockopt(fd, SOL_SOCKET, SO_ERROR, (void *)&sockerr, &sockerrlen);