diff --git a/quic/core/quic_connection.cc b/quic/core/quic_connection.cc
index d6544ee..68af365 100644
--- a/quic/core/quic_connection.cc
+++ b/quic/core/quic_connection.cc
@@ -1868,10 +1868,6 @@
     QUIC_BUG << "Attempt to send empty crypto frame";
     return 0;
   }
-  if (!GetQuicReloadableFlag(quic_fix_checking_should_generate_packet) &&
-      !ShouldGeneratePacket(HAS_RETRANSMITTABLE_DATA, IS_HANDSHAKE)) {
-    return 0;
-  }
   if (level == ENCRYPTION_INITIAL) {
     MaybeActivateLegacyVersionEncapsulation();
   }
diff --git a/quic/core/quic_packet_creator.cc b/quic/core/quic_packet_creator.cc
index 56c3050..e6f01ea 100644
--- a/quic/core/quic_packet_creator.cc
+++ b/quic/core/quic_packet_creator.cc
@@ -1360,13 +1360,9 @@
 
   size_t total_bytes_consumed = 0;
 
-  while (total_bytes_consumed < write_length &&
-         (!GetQuicReloadableFlag(quic_fix_checking_should_generate_packet) ||
-          delegate_->ShouldGeneratePacket(HAS_RETRANSMITTABLE_DATA,
-                                          IS_HANDSHAKE))) {
-    if (GetQuicReloadableFlag(quic_fix_checking_should_generate_packet)) {
-      QUIC_RELOADABLE_FLAG_COUNT(quic_fix_checking_should_generate_packet);
-    }
+  while (
+      total_bytes_consumed < write_length &&
+      delegate_->ShouldGeneratePacket(HAS_RETRANSMITTABLE_DATA, IS_HANDSHAKE)) {
     QuicFrame frame;
     if (!ConsumeCryptoDataToFillCurrentPacket(
             level, write_length - total_bytes_consumed,
diff --git a/quic/core/quic_packet_creator_test.cc b/quic/core/quic_packet_creator_test.cc
index 7c4416d..771a34a 100644
--- a/quic/core/quic_packet_creator_test.cc
+++ b/quic/core/quic_packet_creator_test.cc
@@ -2659,31 +2659,14 @@
        ConsumeCryptoDataCheckShouldGeneratePacket) {
   delegate_.SetCanNotWrite();
 
-  if (GetQuicReloadableFlag(quic_fix_checking_should_generate_packet)) {
-    EXPECT_CALL(delegate_, OnSerializedPacket(_)).Times(0);
-  } else {
-    EXPECT_CALL(delegate_, OnSerializedPacket(_))
-        .WillOnce(
-            Invoke(this, &QuicPacketCreatorMultiplePacketsTest::SavePacket));
-  }
+  EXPECT_CALL(delegate_, OnSerializedPacket(_)).Times(0);
   std::string data = "crypto data";
   size_t consumed_bytes =
       creator_.ConsumeCryptoData(ENCRYPTION_INITIAL, data, 0);
   creator_.Flush();
-  if (GetQuicReloadableFlag(quic_fix_checking_should_generate_packet)) {
-    EXPECT_EQ(0u, consumed_bytes);
-  } else {
-    EXPECT_EQ(data.length(), consumed_bytes);
-  }
+  EXPECT_EQ(0u, consumed_bytes);
   EXPECT_FALSE(creator_.HasPendingFrames());
   EXPECT_FALSE(creator_.HasPendingRetransmittableFrames());
-  if (GetQuicReloadableFlag(quic_fix_checking_should_generate_packet)) {
-    return;
-  }
-  PacketContents contents;
-  contents.num_crypto_frames = 1;
-  contents.num_padding_frames = 1;
-  CheckPacketContains(contents, 0);
 }
 
 TEST_F(QuicPacketCreatorMultiplePacketsTest, ConsumeData_NotWritable) {
