diff --git a/quic/core/quic_dispatcher.cc b/quic/core/quic_dispatcher.cc
index aeda8fc..48f5023 100644
--- a/quic/core/quic_dispatcher.cc
+++ b/quic/core/quic_dispatcher.cc
@@ -354,16 +354,6 @@
     return true;
   }
 
-  // Check if we are buffering packets for this connection ID
-  if (temporarily_buffered_connections_.find(server_connection_id) !=
-      temporarily_buffered_connections_.end()) {
-    // This packet was received while the a CHLO for the same connection ID was
-    // being processed.  Buffer it.
-    BufferEarlyPacket(server_connection_id, form != GOOGLE_QUIC_PACKET,
-                      version);
-    return true;
-  }
-
   if (OnFailedToDispatchPacket(destination_connection_id)) {
     return true;
   }
diff --git a/quic/core/quic_dispatcher.h b/quic/core/quic_dispatcher.h
index d3d73b0..41c58de 100644
--- a/quic/core/quic_dispatcher.h
+++ b/quic/core/quic_dispatcher.h
@@ -397,11 +397,6 @@
   // them.
   QuicBufferedPacketStore buffered_packets_;
 
-  // Set of connection IDs for which asynchronous CHLO processing is in
-  // progress, making it necessary to buffer any other packets which arrive on
-  // that connection until CHLO processing is complete.
-  QuicConnectionIdSet temporarily_buffered_connections_;
-
   // Information about the packet currently being handled.
   QuicSocketAddress current_client_address_;
   QuicSocketAddress current_peer_address_;