diff --git a/quic/core/quic_dispatcher.cc b/quic/core/quic_dispatcher.cc
index afdec63..9fccaab 100644
--- a/quic/core/quic_dispatcher.cc
+++ b/quic/core/quic_dispatcher.cc
@@ -151,7 +151,7 @@
     time_wait_list_manager_->AddConnectionIdToTimeWait(
         server_connection_id_, ietf_quic,
         QuicTimeWaitListManager::SEND_TERMINATION_PACKETS,
-        quic::ENCRYPTION_INITIAL, collector_.packets());
+        collector_.packets());
   }
 
  private:
@@ -746,12 +746,7 @@
       QuicTimeWaitListManager::SEND_STATELESS_RESET;
   if (connection->termination_packets() != nullptr &&
       !connection->termination_packets()->empty()) {
-    if (GetQuicRestartFlag(quic_replace_time_wait_list_encryption_level)) {
-      QUIC_RESTART_FLAG_COUNT(quic_replace_time_wait_list_encryption_level);
-      action = QuicTimeWaitListManager::SEND_CONNECTION_CLOSE_PACKETS;
-    } else {
-      action = QuicTimeWaitListManager::SEND_TERMINATION_PACKETS;
-    }
+    action = QuicTimeWaitListManager::SEND_CONNECTION_CLOSE_PACKETS;
   } else {
     if (!connection->IsHandshakeComplete()) {
       if (!VersionHasIetfInvariantHeader(connection->transport_version())) {
@@ -782,8 +777,7 @@
   }
   time_wait_list_manager_->AddConnectionIdToTimeWait(
       it->first, VersionHasIetfInvariantHeader(connection->transport_version()),
-      action, connection->encryption_level(),
-      connection->termination_packets());
+      action, connection->termination_packets());
   session_map_.erase(it);
 }
 
@@ -932,8 +926,7 @@
                   << ", error_code:" << error_code
                   << ", error_details:" << error_details;
     time_wait_list_manager_->AddConnectionIdToTimeWait(
-        server_connection_id, format != GOOGLE_QUIC_PACKET, action,
-        ENCRYPTION_INITIAL, nullptr);
+        server_connection_id, format != GOOGLE_QUIC_PACKET, action, nullptr);
     return;
   }
 
@@ -968,8 +961,7 @@
       /*versions=*/{}));
   time_wait_list_manager()->AddConnectionIdToTimeWait(
       server_connection_id, /*ietf_quic=*/format != GOOGLE_QUIC_PACKET,
-      QuicTimeWaitListManager::SEND_TERMINATION_PACKETS, ENCRYPTION_INITIAL,
-      &termination_packets);
+      QuicTimeWaitListManager::SEND_TERMINATION_PACKETS, &termination_packets);
 }
 
 bool QuicDispatcher::ShouldCreateSessionForUnknownVersion(
diff --git a/quic/core/quic_dispatcher_test.cc b/quic/core/quic_dispatcher_test.cc
index ef4190d..01ed4fb 100644
--- a/quic/core/quic_dispatcher_test.cc
+++ b/quic/core/quic_dispatcher_test.cc
@@ -867,8 +867,7 @@
   EXPECT_CALL(*time_wait_list_manager_,
               ProcessPacket(_, _, connection_id, _, _))
       .Times(1);
-  EXPECT_CALL(*time_wait_list_manager_,
-              AddConnectionIdToTimeWait(_, _, _, _, _))
+  EXPECT_CALL(*time_wait_list_manager_, AddConnectionIdToTimeWait(_, _, _, _))
       .Times(0);
   ProcessPacket(client_address, connection_id, true, "data");
 }
@@ -884,8 +883,7 @@
   EXPECT_CALL(*time_wait_list_manager_,
               ProcessPacket(_, _, connection_id, _, _))
       .Times(0);
-  EXPECT_CALL(*time_wait_list_manager_,
-              AddConnectionIdToTimeWait(_, _, _, _, _))
+  EXPECT_CALL(*time_wait_list_manager_, AddConnectionIdToTimeWait(_, _, _, _))
       .Times(0);
   EXPECT_CALL(*time_wait_list_manager_, SendPublicReset(_, _, _, _, _))
       .Times(1);
@@ -904,8 +902,7 @@
   QuicReceivedPacket packet2(valid_size_packet, 23, QuicTime::Zero());
   EXPECT_CALL(*dispatcher_, CreateQuicSession(_, _, _, _)).Times(0);
   EXPECT_CALL(*time_wait_list_manager_, ProcessPacket(_, _, _, _, _)).Times(0);
-  EXPECT_CALL(*time_wait_list_manager_,
-              AddConnectionIdToTimeWait(_, _, _, _, _))
+  EXPECT_CALL(*time_wait_list_manager_, AddConnectionIdToTimeWait(_, _, _, _))
       .Times(0);
   // Verify small packet is silently dropped.
   EXPECT_CALL(*time_wait_list_manager_, SendPublicReset(_, _, _, _, _))
@@ -1051,8 +1048,7 @@
               CreateQuicSession(TestConnectionId(1), client_address, _, _))
       .Times(0);
   EXPECT_CALL(*time_wait_list_manager_, ProcessPacket(_, _, _, _, _)).Times(0);
-  EXPECT_CALL(*time_wait_list_manager_,
-              AddConnectionIdToTimeWait(_, _, _, _, _))
+  EXPECT_CALL(*time_wait_list_manager_, AddConnectionIdToTimeWait(_, _, _, _))
       .Times(0);
   ProcessPacket(client_address, TestConnectionId(1), /*has_version_flag=*/true,
                 "data");
@@ -1071,8 +1067,7 @@
   EXPECT_CALL(*dispatcher_, CreateQuicSession(_, client_address, _, _))
       .Times(0);
   EXPECT_CALL(*time_wait_list_manager_, ProcessPacket(_, _, _, _, _)).Times(0);
-  EXPECT_CALL(*time_wait_list_manager_,
-              AddConnectionIdToTimeWait(_, _, _, _, _))
+  EXPECT_CALL(*time_wait_list_manager_, AddConnectionIdToTimeWait(_, _, _, _))
       .Times(0);
   ProcessFirstFlight(client_address, EmptyQuicConnectionId());
 }
@@ -1367,8 +1362,7 @@
 
   EXPECT_CALL(*dispatcher_, CreateQuicSession(_, _, _, _)).Times(0);
   EXPECT_CALL(*time_wait_list_manager_, SendPacket(_, _, _)).Times(0);
-  EXPECT_CALL(*time_wait_list_manager_,
-              AddConnectionIdToTimeWait(_, _, _, _, _))
+  EXPECT_CALL(*time_wait_list_manager_, AddConnectionIdToTimeWait(_, _, _, _))
       .Times(0);
   ProcessPacket(client_address, TestConnectionId(1), /*has_version_flag=*/true,
                 version_, SerializeCHLO(), /*full_padding=*/false,
@@ -1519,8 +1513,7 @@
   QuicConnectionId connection_id = TestConnectionId(1);
   EXPECT_CALL(*dispatcher_, CreateQuicSession(_, _, _, _)).Times(0);
   EXPECT_CALL(*time_wait_list_manager_, ProcessPacket(_, _, _, _, _)).Times(0);
-  EXPECT_CALL(*time_wait_list_manager_,
-              AddConnectionIdToTimeWait(_, _, _, _, _))
+  EXPECT_CALL(*time_wait_list_manager_, AddConnectionIdToTimeWait(_, _, _, _))
       .Times(0);
 
   ProcessPacket(client_address, connection_id, true, "data",
diff --git a/quic/core/quic_time_wait_list_manager.cc b/quic/core/quic_time_wait_list_manager.cc
index 433a3ab..274364c 100644
--- a/quic/core/quic_time_wait_list_manager.cc
+++ b/quic/core/quic_time_wait_list_manager.cc
@@ -70,7 +70,6 @@
     QuicConnectionId connection_id,
     bool ietf_quic,
     TimeWaitAction action,
-    EncryptionLevel encryption_level,
     std::vector<std::unique_ptr<QuicEncryptedPacket>>* termination_packets) {
   DCHECK(action != SEND_TERMINATION_PACKETS || termination_packets != nullptr);
   DCHECK(action != DO_NOTHING || ietf_quic);
@@ -89,7 +88,6 @@
   ConnectionIdData data(num_packets, ietf_quic, clock_->ApproximateNow(),
                         action);
   if (termination_packets != nullptr) {
-    data.encryption_level = encryption_level;
     data.termination_packets.swap(*termination_packets);
   }
   connection_id_map_.emplace(std::make_pair(connection_id, std::move(data)));
@@ -140,8 +138,7 @@
                   << " ietf=" << connection_data->ietf_quic
                   << ", action=" << connection_data->action
                   << ", number termination packets="
-                  << connection_data->termination_packets.size()
-                  << ", encryption level=" << connection_data->encryption_level;
+                  << connection_data->termination_packets.size();
   switch (connection_data->action) {
     case SEND_TERMINATION_PACKETS:
       if (connection_data->termination_packets.empty()) {
@@ -153,31 +150,16 @@
           if (!connection_data->ietf_quic) {
             QUIC_CODE_COUNT(quic_received_long_header_packet_for_gquic);
           }
-          if (connection_data->encryption_level == ENCRYPTION_FORWARD_SECURE) {
-            QUIC_CODE_COUNT(
-                quic_forward_secure_termination_packets_for_long_header);
-          }
           break;
         case IETF_QUIC_SHORT_HEADER_PACKET:
           if (!connection_data->ietf_quic) {
             QUIC_CODE_COUNT(quic_received_short_header_packet_for_gquic);
           }
-          if (GetQuicRestartFlag(
-                  quic_replace_time_wait_list_encryption_level) ||
-              connection_data->encryption_level == ENCRYPTION_INITIAL) {
-            // TODO(b/153096082) Rename this code count.
-            QUIC_CODE_COUNT(
-                quic_encryption_none_termination_packets_for_short_header);
-            // Send stateless reset in response to short header packets.
-            SendPublicReset(self_address, peer_address, connection_id,
-                            connection_data->ietf_quic,
-                            std::move(packet_context));
-            return;
-          }
-          if (connection_data->encryption_level == ENCRYPTION_ZERO_RTT) {
-            QUIC_CODE_COUNT(quic_zero_rtt_termination_packets_for_short_header);
-          }
-          break;
+          // Send stateless reset in response to short header packets.
+          SendPublicReset(self_address, peer_address, connection_id,
+                          connection_data->ietf_quic,
+                          std::move(packet_context));
+          return;
         case GOOGLE_QUIC_PACKET:
           if (connection_data->ietf_quic) {
             QUIC_CODE_COUNT(quic_received_gquic_packet_for_ietf_quic);
@@ -418,7 +400,6 @@
     : num_packets(num_packets),
       ietf_quic(ietf_quic),
       time_added(time_added),
-      encryption_level(ENCRYPTION_INITIAL),
       action(action) {}
 
 QuicTimeWaitListManager::ConnectionIdData::ConnectionIdData(
diff --git a/quic/core/quic_time_wait_list_manager.h b/quic/core/quic_time_wait_list_manager.h
index 64138de..dcbc528 100644
--- a/quic/core/quic_time_wait_list_manager.h
+++ b/quic/core/quic_time_wait_list_manager.h
@@ -82,7 +82,6 @@
       QuicConnectionId connection_id,
       bool ietf_quic,
       TimeWaitAction action,
-      EncryptionLevel encryption_level,
       std::vector<std::unique_ptr<QuicEncryptedPacket>>* termination_packets);
 
   // Returns true if the connection_id is in time wait state, false otherwise.
@@ -247,9 +246,6 @@
     int num_packets;
     bool ietf_quic;
     QuicTime time_added;
-    // TODO(b/153096082) Remove this field.
-    // Encryption level of termination_packets.
-    EncryptionLevel encryption_level;
     // These packets may contain CONNECTION_CLOSE frames, or SREJ messages.
     std::vector<std::unique_ptr<QuicEncryptedPacket>> termination_packets;
     TimeWaitAction action;
diff --git a/quic/core/quic_time_wait_list_manager_test.cc b/quic/core/quic_time_wait_list_manager_test.cc
index 468b21b..2f764de 100644
--- a/quic/core/quic_time_wait_list_manager_test.cc
+++ b/quic/core/quic_time_wait_list_manager_test.cc
@@ -154,7 +154,7 @@
         new QuicEncryptedPacket(nullptr, 0, false)));
     time_wait_list_manager_.AddConnectionIdToTimeWait(
         connection_id, false, QuicTimeWaitListManager::SEND_TERMINATION_PACKETS,
-        ENCRYPTION_INITIAL, &termination_packets);
+        &termination_packets);
   }
 
   void AddConnectionId(
@@ -164,7 +164,7 @@
       std::vector<std::unique_ptr<QuicEncryptedPacket>>* packets) {
     time_wait_list_manager_.AddConnectionIdToTimeWait(
         connection_id, VersionHasIetfInvariantHeader(version.transport_version),
-        action, ENCRYPTION_INITIAL, packets);
+        action, packets);
   }
 
   bool IsConnectionIdInTimeWait(QuicConnectionId connection_id) {
@@ -322,12 +322,9 @@
   termination_packets.push_back(
       std::unique_ptr<QuicEncryptedPacket>(new QuicEncryptedPacket(
           new char[kConnectionCloseLength], kConnectionCloseLength, true)));
-  AddConnectionId(
-      connection_id_, QuicVersionMax(),
-      GetQuicRestartFlag(quic_replace_time_wait_list_encryption_level)
-          ? QuicTimeWaitListManager::SEND_CONNECTION_CLOSE_PACKETS
-          : QuicTimeWaitListManager::SEND_TERMINATION_PACKETS,
-      &termination_packets);
+  AddConnectionId(connection_id_, QuicVersionMax(),
+                  QuicTimeWaitListManager::SEND_CONNECTION_CLOSE_PACKETS,
+                  &termination_packets);
   EXPECT_CALL(writer_, WritePacket(_, kConnectionCloseLength,
                                    self_address_.host(), peer_address_, _))
       .WillOnce(Return(WriteResult(WRITE_STATUS_OK, 1)));
@@ -345,12 +342,9 @@
   termination_packets.push_back(
       std::unique_ptr<QuicEncryptedPacket>(new QuicEncryptedPacket(
           new char[kConnectionCloseLength], kConnectionCloseLength, true)));
-  AddConnectionId(
-      connection_id_, QuicVersionMax(),
-      GetQuicRestartFlag(quic_replace_time_wait_list_encryption_level)
-          ? QuicTimeWaitListManager::SEND_CONNECTION_CLOSE_PACKETS
-          : QuicTimeWaitListManager::SEND_TERMINATION_PACKETS,
-      &termination_packets);
+  AddConnectionId(connection_id_, QuicVersionMax(),
+                  QuicTimeWaitListManager::SEND_CONNECTION_CLOSE_PACKETS,
+                  &termination_packets);
   EXPECT_CALL(writer_, WritePacket(_, kConnectionCloseLength,
                                    self_address_.host(), peer_address_, _))
       .Times(2)
@@ -635,11 +629,9 @@
   termination_packets.push_back(
       std::unique_ptr<QuicEncryptedPacket>(new QuicEncryptedPacket(
           new char[kConnectionCloseLength], kConnectionCloseLength, true)));
-  // Add an ENCRYPTION_INITIAL termination packet.
   time_wait_list_manager_.AddConnectionIdToTimeWait(
       connection_id_, /*ietf_quic=*/true,
-      QuicTimeWaitListManager::SEND_TERMINATION_PACKETS, ENCRYPTION_INITIAL,
-      &termination_packets);
+      QuicTimeWaitListManager::SEND_TERMINATION_PACKETS, &termination_packets);
 
   // Termination packet is not encrypted, instead, send stateless reset.
   EXPECT_CALL(writer_,
@@ -654,7 +646,6 @@
 
 TEST_F(QuicTimeWaitListManagerTest,
        SendConnectionClosePacketsInResponseToShortHeaders) {
-  SetQuicRestartFlag(quic_replace_time_wait_list_encryption_level, true);
   const size_t kConnectionCloseLength = 100;
   EXPECT_CALL(visitor_, OnConnectionAddedToTimeWaitList(connection_id_));
   std::vector<std::unique_ptr<QuicEncryptedPacket>> termination_packets;
@@ -665,7 +656,7 @@
   time_wait_list_manager_.AddConnectionIdToTimeWait(
       connection_id_, /*ietf_quic=*/true,
       QuicTimeWaitListManager::SEND_CONNECTION_CLOSE_PACKETS,
-      ENCRYPTION_INITIAL, &termination_packets);
+      &termination_packets);
   EXPECT_CALL(writer_, WritePacket(_, kConnectionCloseLength,
                                    self_address_.host(), peer_address_, _))
       .WillOnce(Return(WriteResult(WRITE_STATUS_OK, 1)));
diff --git a/quic/test_tools/mock_quic_time_wait_list_manager.cc b/quic/test_tools/mock_quic_time_wait_list_manager.cc
index b1890f0..ec63558 100644
--- a/quic/test_tools/mock_quic_time_wait_list_manager.cc
+++ b/quic/test_tools/mock_quic_time_wait_list_manager.cc
@@ -18,9 +18,9 @@
     : QuicTimeWaitListManager(writer, visitor, clock, alarm_factory) {
   // Though AddConnectionIdToTimeWait is mocked, we want to retain its
   // functionality.
-  EXPECT_CALL(*this, AddConnectionIdToTimeWait(_, _, _, _, _))
+  EXPECT_CALL(*this, AddConnectionIdToTimeWait(_, _, _, _))
       .Times(testing::AnyNumber());
-  ON_CALL(*this, AddConnectionIdToTimeWait(_, _, _, _, _))
+  ON_CALL(*this, AddConnectionIdToTimeWait(_, _, _, _))
       .WillByDefault(
           Invoke(this, &MockTimeWaitListManager::
                            QuicTimeWaitListManager_AddConnectionIdToTimeWait));
diff --git a/quic/test_tools/mock_quic_time_wait_list_manager.h b/quic/test_tools/mock_quic_time_wait_list_manager.h
index 54bd6d4..3dae5ad 100644
--- a/quic/test_tools/mock_quic_time_wait_list_manager.h
+++ b/quic/test_tools/mock_quic_time_wait_list_manager.h
@@ -24,7 +24,6 @@
               (QuicConnectionId connection_id,
                bool ietf_quic,
                QuicTimeWaitListManager::TimeWaitAction action,
-               EncryptionLevel encryption_level,
                std::vector<std::unique_ptr<QuicEncryptedPacket>>*),
               (override));
 
@@ -32,11 +31,9 @@
       QuicConnectionId connection_id,
       bool ietf_quic,
       QuicTimeWaitListManager::TimeWaitAction action,
-      EncryptionLevel encryption_level,
       std::vector<std::unique_ptr<QuicEncryptedPacket>>* termination_packets) {
-    QuicTimeWaitListManager::AddConnectionIdToTimeWait(connection_id, ietf_quic,
-                                                       action, encryption_level,
-                                                       termination_packets);
+    QuicTimeWaitListManager::AddConnectionIdToTimeWait(
+        connection_id, ietf_quic, action, termination_packets);
   }
 
   MOCK_METHOD(void,