diff --git a/quic/core/quic_session.cc b/quic/core/quic_session.cc
index a9858d8..3128a55 100644
--- a/quic/core/quic_session.cc
+++ b/quic/core/quic_session.cc
@@ -1143,13 +1143,6 @@
 
 void QuicSession::OnCryptoHandshakeEvent(CryptoHandshakeEvent event) {
   switch (event) {
-    // TODO(satyamshekhar): Move the logic of setting the encrypter/decrypter
-    // to QuicSession since it is the glue.
-    case ENCRYPTION_FIRST_ESTABLISHED:
-      // Given any streams blocked by encryption a chance to write.
-      OnCanWrite();
-      break;
-
     case ENCRYPTION_REESTABLISHED:
       // Retransmit originally packets that were sent, since they can't be
       // decrypted by the peer.
diff --git a/quic/core/quic_session.h b/quic/core/quic_session.h
index 4e7afea..b506906 100644
--- a/quic/core/quic_session.h
+++ b/quic/core/quic_session.h
@@ -70,10 +70,6 @@
 
   // CryptoHandshakeEvent enumerates the events generated by a QuicCryptoStream.
   enum CryptoHandshakeEvent {
-    // ENCRYPTION_FIRST_ESTABLISHED indicates that a full client hello has been
-    // sent by a client and that subsequent packets will be encrypted. (Client
-    // only.)
-    ENCRYPTION_FIRST_ESTABLISHED,
     // ENCRYPTION_REESTABLISHED indicates that a client hello was rejected by
     // the server and thus the encryption key has been updated. Therefore the
     // connection should resend any packets that were sent under
@@ -240,7 +236,6 @@
   // Called by the QuicCryptoStream when the handshake enters a new state.
   //
   // Clients will call this function in the order:
-  //   ENCRYPTION_FIRST_ESTABLISHED
   //   zero or more ENCRYPTION_REESTABLISHED
   //   HANDSHAKE_CONFIRMED
   //
diff --git a/quic/quartc/quartc_session.cc b/quic/quartc/quartc_session.cc
index a7a96ee..599ea46 100644
--- a/quic/quartc/quartc_session.cc
+++ b/quic/quartc/quartc_session.cc
@@ -152,7 +152,6 @@
 void QuartcSession::OnCryptoHandshakeEvent(CryptoHandshakeEvent event) {
   QuicSession::OnCryptoHandshakeEvent(event);
   switch (event) {
-    case ENCRYPTION_FIRST_ESTABLISHED:
     case ENCRYPTION_REESTABLISHED:
       // 1-rtt setup triggers 'ENCRYPTION_REESTABLISHED' (after REJ, when the
       // CHLO is sent).