diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h
index 66ae1283..2a388c7c 100644
--- a/include/openssl/ssl.h
+++ b/include/openssl/ssl.h
@@ -1188,7 +1188,11 @@ struct ssl_st
 	 * test instead of an "init" member.
 	 */
 
-	int server;	/* are we the server side? - mostly used by SSL_clear*/
+	/* server is true iff the this SSL* is the server half. Note:
+	 * before the SSL* is initialized by either
+	 * SSL_set_accept_state or SSL_set_connect_state, the side is
+	 * not determined. In this state, server is always false. */
+	int server;
 
 	int new_session;/* Generate a new session or reuse an old one.
 	                 * NB: For servers, the 'new' session may actually be a previously
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index 80a8c2b6..783e8aef 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -210,7 +210,20 @@ int SSL_clear(SSL *s)
 		}
 #endif
 
-	s->state=SSL_ST_BEFORE|((s->server)?SSL_ST_ACCEPT:SSL_ST_CONNECT);
+	/* SSL_clear may be called before or after the |s| is initialized in
+	 * either accept or connect state. In the latter case, SSL_clear should
+	 * preserve the half and reset |s->state| accordingly. */
+	if (s->handshake_func != NULL)
+		{
+		if (s->server)
+			SSL_set_accept_state(s);
+		else
+			SSL_set_connect_state(s);
+		}
+	else
+		{
+		assert(s->state == 0);
+		}
 
 	s->version=s->method->version;
 	s->client_version=s->version;
@@ -369,7 +382,6 @@ SSL *SSL_new(SSL_CTX *ctx)
 		goto err;
 
 	s->references=1;
-	s->server=(ctx->method->ssl_accept == ssl_undefined_function)?0:1;
 
 	SSL_clear(s);