diff --git a/quic/core/congestion_control/general_loss_algorithm.cc b/quic/core/congestion_control/general_loss_algorithm.cc
index 356501f..56b24f7 100644
--- a/quic/core/congestion_control/general_loss_algorithm.cc
+++ b/quic/core/congestion_control/general_loss_algorithm.cc
@@ -43,11 +43,6 @@
   reordering_shift_ = loss_type == kAdaptiveTime
                           ? kDefaultAdaptiveLossDelayShift
                           : kDefaultLossDelayShift;
-  if (GetQuicReloadableFlag(quic_eighth_rtt_loss_detection) &&
-      loss_type == kTime) {
-    QUIC_RELOADABLE_FLAG_COUNT(quic_eighth_rtt_loss_detection);
-    reordering_shift_ = 3;
-  }
   largest_previously_acked_.Clear();
 }
 
diff --git a/quic/core/congestion_control/general_loss_algorithm_test.cc b/quic/core/congestion_control/general_loss_algorithm_test.cc
index 4fdd05f..f6e203e 100644
--- a/quic/core/congestion_control/general_loss_algorithm_test.cc
+++ b/quic/core/congestion_control/general_loss_algorithm_test.cc
@@ -365,13 +365,8 @@
     VerifyLosses(2, packets_acked, std::vector<uint64_t>{});
     packets_acked.clear();
   }
-  if (GetQuicReloadableFlag(quic_eighth_rtt_loss_detection)) {
-    EXPECT_EQ(1.125 * rtt_stats_.smoothed_rtt(),
-              loss_algorithm_.GetLossTimeout() - clock_.Now());
-  } else {
-    EXPECT_EQ(1.25 * rtt_stats_.smoothed_rtt(),
-              loss_algorithm_.GetLossTimeout() - clock_.Now());
-  }
+  EXPECT_EQ(1.25 * rtt_stats_.smoothed_rtt(),
+            loss_algorithm_.GetLossTimeout() - clock_.Now());
 }
 
 TEST_F(GeneralLossAlgorithmTest, NoLossUntilTimeout) {
@@ -391,15 +386,9 @@
       QuicPacketNumber(2), kMaxOutgoingPacketSize, QuicTime::Zero()));
   VerifyLosses(2, packets_acked, std::vector<uint64_t>{});
   packets_acked.clear();
-  if (GetQuicReloadableFlag(quic_eighth_rtt_loss_detection)) {
-    // Expect the timer to be set to 0.25 RTT's in the future.
-    EXPECT_EQ(0.125 * rtt_stats_.smoothed_rtt(),
-              loss_algorithm_.GetLossTimeout() - clock_.Now());
-  } else {
-    // Expect the timer to be set to 0.25 RTT's in the future.
-    EXPECT_EQ(0.25 * rtt_stats_.smoothed_rtt(),
-              loss_algorithm_.GetLossTimeout() - clock_.Now());
-  }
+  // Expect the timer to be set to 0.25 RTT's in the future.
+  EXPECT_EQ(0.25 * rtt_stats_.smoothed_rtt(),
+            loss_algorithm_.GetLossTimeout() - clock_.Now());
   VerifyLosses(2, packets_acked, std::vector<uint64_t>{});
   clock_.AdvanceTime(0.25 * rtt_stats_.smoothed_rtt());
   VerifyLosses(2, packets_acked, {1});
@@ -450,15 +439,9 @@
       QuicPacketNumber(10), kMaxOutgoingPacketSize, QuicTime::Zero()));
   VerifyLosses(10, packets_acked, std::vector<uint64_t>{});
   packets_acked.clear();
-  if (GetQuicReloadableFlag(quic_eighth_rtt_loss_detection)) {
-    // Expect the timer to be set to 0.25 RTT's in the future.
-    EXPECT_EQ(0.125 * rtt_stats_.smoothed_rtt(),
-              loss_algorithm_.GetLossTimeout() - clock_.Now());
-  } else {
-    // Expect the timer to be set to 0.25 RTT's in the future.
-    EXPECT_EQ(0.25 * rtt_stats_.smoothed_rtt(),
-              loss_algorithm_.GetLossTimeout() - clock_.Now());
-  }
+  // Expect the timer to be set to 0.25 RTT's in the future.
+  EXPECT_EQ(0.25 * rtt_stats_.smoothed_rtt(),
+            loss_algorithm_.GetLossTimeout() - clock_.Now());
   clock_.AdvanceTime(0.25 * rtt_stats_.smoothed_rtt());
   VerifyLosses(10, packets_acked, {1, 2, 3, 4, 5, 6, 7, 8, 9});
   EXPECT_EQ(QuicTime::Zero(), loss_algorithm_.GetLossTimeout());
@@ -482,15 +465,9 @@
       QuicPacketNumber(10), kMaxOutgoingPacketSize, QuicTime::Zero()));
   VerifyLosses(10, packets_acked, std::vector<uint64_t>{});
   packets_acked.clear();
-  if (GetQuicReloadableFlag(quic_eighth_rtt_loss_detection)) {
-    // Expect the timer to be set to 0.25 RTT's in the future.
-    EXPECT_EQ(0.125 * rtt_stats_.smoothed_rtt(),
-              loss_algorithm_.GetLossTimeout() - clock_.Now());
-  } else {
-    // Expect the timer to be set to 0.25 RTT's in the future.
-    EXPECT_EQ(0.25 * rtt_stats_.smoothed_rtt(),
-              loss_algorithm_.GetLossTimeout() - clock_.Now());
-  }
+  // Expect the timer to be set to 0.25 RTT's in the future.
+  EXPECT_EQ(0.25 * rtt_stats_.smoothed_rtt(),
+            loss_algorithm_.GetLossTimeout() - clock_.Now());
   clock_.AdvanceTime(0.25 * rtt_stats_.smoothed_rtt());
   // Now ack packets 1 to 9 and ensure the timer is no longer set and no packets
   // are lost.
