diff --git a/quic/core/quic_connection.cc b/quic/core/quic_connection.cc
index 21c9e66..df6c5c2 100644
--- a/quic/core/quic_connection.cc
+++ b/quic/core/quic_connection.cc
@@ -4282,18 +4282,11 @@
     if (!ack_timeout.IsInitialized()) {
       continue;
     }
-    if (GetQuicReloadableFlag(quic_always_send_earliest_ack)) {
-      QUIC_RELOADABLE_FLAG_COUNT(quic_always_send_earliest_ack);
-    }
-    if (ack_timeout > clock_->ApproximateNow()) {
-      if (!GetQuicReloadableFlag(quic_always_send_earliest_ack)) {
-        continue;
-      }
-      if (ack_timeout > earliest_ack_timeout) {
-        // Always send the earliest ACK to make forward progress in case alarm
-        // fires early.
-        continue;
-      }
+    if (ack_timeout > clock_->ApproximateNow() &&
+        ack_timeout > earliest_ack_timeout) {
+      // Always send the earliest ACK to make forward progress in case alarm
+      // fires early.
+      continue;
     }
     QUIC_DVLOG(1) << ENDPOINT << "Sending ACK of packet number space "
                   << PacketNumberSpaceToString(
diff --git a/quic/core/quic_connection_test.cc b/quic/core/quic_connection_test.cc
index bf61ade..59f12bb 100644
--- a/quic/core/quic_connection_test.cc
+++ b/quic/core/quic_connection_test.cc
@@ -10945,22 +10945,12 @@
             connection_.GetAckAlarm()->deadline());
 
   // Ack alarm fires early.
-  if (GetQuicReloadableFlag(quic_always_send_earliest_ack)) {
-    // Verify the earliest ACK is flushed.
-    EXPECT_CALL(*send_algorithm_, OnPacketSent(_, _, _, _, _)).Times(1);
-  } else {
-    EXPECT_CALL(*send_algorithm_, OnPacketSent(_, _, _, _, _)).Times(0);
-  }
+  // Verify the earliest ACK is flushed.
+  EXPECT_CALL(*send_algorithm_, OnPacketSent(_, _, _, _, _)).Times(1);
   connection_.GetAckAlarm()->Fire();
   EXPECT_TRUE(connection_.HasPendingAcks());
-  if (GetQuicReloadableFlag(quic_always_send_earliest_ack)) {
-    EXPECT_EQ(clock_.ApproximateNow() + DefaultDelayedAckTime(),
-              connection_.GetAckAlarm()->deadline());
-  } else {
-    // No forward progress has been made.
-    EXPECT_EQ(clock_.ApproximateNow() + kAlarmGranularity,
-              connection_.GetAckAlarm()->deadline());
-  }
+  EXPECT_EQ(clock_.ApproximateNow() + DefaultDelayedAckTime(),
+            connection_.GetAckAlarm()->deadline());
 }
 
 TEST_P(QuicConnectionTest, ClientOnlyBlackholeDetectionClient) {
