diff --git a/video/encoder_bitrate_adjuster.cc b/video/encoder_bitrate_adjuster.cc
index 45d88875e3..6a2c99ffe3 100644
--- a/video/encoder_bitrate_adjuster.cc
+++ b/video/encoder_bitrate_adjuster.cc
@@ -314,15 +314,14 @@ void EncoderBitrateAdjuster::OnEncoderInfo(
   AdjustRateAllocation(current_rate_control_parameters_);
 }
 
-void EncoderBitrateAdjuster::OnEncodedFrame(const EncodedImage& encoded_image,
+void EncoderBitrateAdjuster::OnEncodedFrame(DataSize size,
+                                            int spatial_index,
                                             int temporal_index) {
   ++frames_since_layout_change_;
   // Detectors may not exist, for instance if ScreenshareLayers is used.
-  auto& detector =
-      overshoot_detectors_[encoded_image.SpatialIndex().value_or(0)]
-                          [temporal_index];
+  auto& detector = overshoot_detectors_[spatial_index][temporal_index];
   if (detector) {
-    detector->OnEncodedFrame(encoded_image.size(), rtc::TimeMillis());
+    detector->OnEncodedFrame(size.bytes(), rtc::TimeMillis());
   }
 }
 
diff --git a/video/encoder_bitrate_adjuster.h b/video/encoder_bitrate_adjuster.h
index b142519b4e..74d0289ad0 100644
--- a/video/encoder_bitrate_adjuster.h
+++ b/video/encoder_bitrate_adjuster.h
@@ -47,7 +47,7 @@ class EncoderBitrateAdjuster {
   void OnEncoderInfo(const VideoEncoder::EncoderInfo& encoder_info);
 
   // Updates the overuse detectors according to the encoded image size.
-  void OnEncodedFrame(const EncodedImage& encoded_image, int temporal_index);
+  void OnEncodedFrame(DataSize size, int spatial_index, int temporal_index);
 
   void Reset();
 
diff --git a/video/encoder_bitrate_adjuster_unittest.cc b/video/encoder_bitrate_adjuster_unittest.cc
index d8fcf382b2..c249a5cb79 100644
--- a/video/encoder_bitrate_adjuster_unittest.cc
+++ b/video/encoder_bitrate_adjuster_unittest.cc
@@ -160,15 +160,12 @@ class EncoderBitrateAdjusterTest : public ::testing::Test {
 
         int sequence_idx = sequence_idx_[si][ti];
         sequence_idx_[si][ti] = (sequence_idx_[si][ti] + 1) % kSequenceLength;
-        const size_t frame_size_bytes =
+        const DataSize frame_size = DataSize::Bytes(
             (sequence_idx < kSequenceLength / 2)
                 ? media_frame_size - network_frame_size_diff_bytes
-                : media_frame_size + network_frame_size_diff_bytes;
+                : media_frame_size + network_frame_size_diff_bytes);
 
-        EncodedImage image;
-        image.SetEncodedData(EncodedImageBuffer::Create(frame_size_bytes));
-        image.SetSpatialIndex(si);
-        adjuster_->OnEncodedFrame(image, ti);
+        adjuster_->OnEncodedFrame(frame_size, si, ti);
         sequence_idx = ++sequence_idx % kSequenceLength;
       }
     }
diff --git a/video/video_stream_encoder.cc b/video/video_stream_encoder.cc
index c5a3b98756..07094e1a39 100644
--- a/video/video_stream_encoder.cc
+++ b/video/video_stream_encoder.cc
@@ -2159,7 +2159,8 @@ void VideoStreamEncoder::RunPostEncode(const EncodedImage& encoded_image,
   stream_resource_manager_.OnEncodeCompleted(encoded_image, time_sent_us,
                                              encode_duration_us);
   if (bitrate_adjuster_) {
-    bitrate_adjuster_->OnEncodedFrame(encoded_image, temporal_index);
+    bitrate_adjuster_->OnEncodedFrame(
+        frame_size, encoded_image.SpatialIndex().value_or(0), temporal_index);
   }
 }
 
diff --git a/video/video_stream_encoder_unittest.cc b/video/video_stream_encoder_unittest.cc
index fcfa6778ae..ebc1c29228 100644
--- a/video/video_stream_encoder_unittest.cc
+++ b/video/video_stream_encoder_unittest.cc
@@ -6953,11 +6953,7 @@ TEST_F(VideoStreamEncoderTest, DropsFramesWhenEncoderOvershoots) {
     // doesn't push back as hard so we don't need quite as much overshoot.
     // These numbers are unfortunately a bit magical but there's not trivial
     // way to algebraically infer them.
-    if (trials.BitrateAdjusterCanUseNetworkHeadroom()) {
-      overshoot_factor = 2.4;
-    } else {
-      overshoot_factor = 4.0;
-    }
+    overshoot_factor = 3.0;
   }
   fake_encoder_.SimulateOvershoot(overshoot_factor);
   video_stream_encoder_->OnBitrateUpdatedAndWaitForManagedResources(