diff --git a/examples/spdycat.cc b/examples/spdycat.cc
index 69f337af..b433958e 100644
--- a/examples/spdycat.cc
+++ b/examples/spdycat.cc
@@ -138,8 +138,6 @@ int communicate(const std::string& host, uint16_t port,
     std::cerr << "Could not connect to the host" << std::endl;
     return -1;
   }
-  make_non_block(fd);
-  set_tcp_nodelay(fd);
   SSL_CTX *ssl_ctx;
   ssl_ctx = SSL_CTX_new(SSLv23_client_method());
   if(!ssl_ctx) {
@@ -155,6 +153,8 @@ int communicate(const std::string& host, uint16_t port,
   if(ssl_handshake(ssl, fd) == -1) {
     return -1;
   }
+  make_non_block(fd);
+  set_tcp_nodelay(fd);
   Spdylay sc(fd, ssl, callbacks);
 
   nfds_t npollfds = 1;
diff --git a/examples/spdylay_ssl.cc b/examples/spdylay_ssl.cc
index 3b52a67f..f6964228 100644
--- a/examples/spdylay_ssl.cc
+++ b/examples/spdylay_ssl.cc
@@ -476,22 +476,7 @@ int ssl_handshake(SSL *ssl, int fd)
     std::cerr << ERR_error_string(ERR_get_error(), 0) << std::endl;
     return -1;
   }
-  int loop_count = 0;
   int r = SSL_connect(ssl);
-  nfds_t npollfds = 1;
-  pollfd pollfds[1];
-  pollfds[0].fd = fd;
-
-  while(r == -1) {
-    ++loop_count;
-    int nfds = poll(pollfds, npollfds, -1);
-    if(nfds == -1)
-      continue;
-    r = SSL_connect(ssl);
-  }
-  std::cerr << "Loop iterated #" << loop_count << " times." << std::endl;
-  //std::cerr << "Event is " << pollfds[0].events << ":" << pollfds[0].revents << std::endl;
-
   if(r <= 0) {
     std::cerr << ERR_error_string(ERR_get_error(), 0) << std::endl;
     return -1;