diff --git a/lib/handshake.c b/lib/handshake.c
index 1d362109..2bda5174 100644
--- a/lib/handshake.c
+++ b/lib/handshake.c
@@ -211,7 +211,7 @@ postbody_completion:
 					goto bail;
 			}
 
-			goto http_complete;
+			break;
 		}
 		break;
 
@@ -241,20 +241,6 @@ read_ok:
 
 	return buf - oldbuf;
 
-http_complete:
-	lwsl_debug("%s: http_complete\n", __func__);
-
-#ifndef LWS_NO_SERVER
-	/* Did the client want to keep the HTTP connection going? */
-	if (lws_http_transaction_completed(wsi))
-		goto bail;
-#endif
-	/* we may have next header set already, but return to event loop first
-	 * so a heaily-pipelined http/1.1 connection cannot monopolize the
-	 * service thread with GET hugefile.bin GET hugefile.bin etc
-	 */
-	goto read_ok;
-
 bail:
 	lwsl_debug("closing connection at lws_read bail:\n");
 	lws_close_free_wsi(wsi, LWS_CLOSE_STATUS_NOSTATUS);