diff --git a/quic/core/quic_packet_reader.cc b/quic/core/quic_packet_reader.cc
index dd76e75..3334042 100644
--- a/quic/core/quic_packet_reader.cc
+++ b/quic/core/quic_packet_reader.cc
@@ -45,16 +45,11 @@
     read_results_[i].Reset(
         /*packet_buffer_length=*/sizeof(read_buffers_[i].packet_buffer));
   }
-  QuicWallTime wallnow = clock.WallNow();
-  const bool use_quic_time =
-      GetQuicReloadableFlag(quic_use_quic_time_for_received_timestamp2);
-  QuicTime now = QuicTime::Zero();
-  if (use_quic_time) {
-    QUIC_RELOADABLE_FLAG_COUNT(quic_use_quic_time_for_received_timestamp2);
-    // Use clock.Now() as the packet receipt time, the time between packet
-    // arriving at the host and now is considered part of the network delay.
-    now = clock.Now();
-  }
+
+  // Use clock.Now() as the packet receipt time, the time between packet
+  // arriving at the host and now is considered part of the network delay.
+  QuicTime now = clock.Now();
+
   size_t packets_read = socket_api_.ReadMultiplePackets(
       fd,
       BitMask64(QuicUdpPacketInfoBit::DROPPED_PACKETS,
@@ -86,11 +81,6 @@
       continue;
     }
 
-    QuicWallTime walltimestamp =
-        result.packet_info.HasValue(QuicUdpPacketInfoBit::RECV_TIMESTAMP)
-            ? result.packet_info.receive_timestamp()
-            : wallnow;
-
     bool has_ttl = result.packet_info.HasValue(QuicUdpPacketInfoBit::TTL);
     int ttl = has_ttl ? result.packet_info.ttl() : 0;
     if (!has_ttl) {
@@ -108,8 +98,7 @@
     }
 
     QuicReceivedPacket packet(
-        result.packet_buffer.buffer, result.packet_buffer.buffer_len,
-        use_quic_time ? now : clock.ConvertWallTimeToQuicTime(walltimestamp),
+        result.packet_buffer.buffer, result.packet_buffer.buffer_len, now,
         /*owns_buffer=*/false, ttl, has_ttl, headers, headers_length,
         /*owns_header_buffer=*/false);
 
