diff --git a/api/video/video_frame.cc b/api/video/video_frame.cc
index 7a71f43493..8040536ced 100644
--- a/api/video/video_frame.cc
+++ b/api/video/video_frame.cc
@@ -196,6 +196,12 @@ rtc::scoped_refptr<VideoFrameBuffer> VideoFrame::video_frame_buffer() const {
   return video_frame_buffer_;
 }
 
+void VideoFrame::set_video_frame_buffer(
+    const rtc::scoped_refptr<VideoFrameBuffer>& buffer) {
+  RTC_CHECK(buffer);
+  video_frame_buffer_ = buffer;
+}
+
 int64_t VideoFrame::render_time_ms() const {
   return timestamp_us() / rtc::kNumMicrosecsPerMillisec;
 }
diff --git a/api/video/video_frame.h b/api/video/video_frame.h
index c7dd02a7b1..5e04c1bcfe 100644
--- a/api/video/video_frame.h
+++ b/api/video/video_frame.h
@@ -160,6 +160,9 @@ class RTC_EXPORT VideoFrame {
   // initialized VideoFrame.
   rtc::scoped_refptr<webrtc::VideoFrameBuffer> video_frame_buffer() const;
 
+  void set_video_frame_buffer(
+      const rtc::scoped_refptr<VideoFrameBuffer>& buffer);
+
   // TODO(nisse): Deprecated.
   // Return true if the frame is stored in a texture.
   bool is_texture() const {
diff --git a/media/base/adapted_video_track_source.cc b/media/base/adapted_video_track_source.cc
index 9716882fbc..c8c3222a12 100644
--- a/media/base/adapted_video_track_source.cc
+++ b/media/base/adapted_video_track_source.cc
@@ -51,14 +51,10 @@ void AdaptedVideoTrackSource::OnFrame(const webrtc::VideoFrame& frame) {
   if (apply_rotation() && frame.rotation() != webrtc::kVideoRotation_0 &&
       buffer->type() == webrtc::VideoFrameBuffer::Type::kI420) {
     /* Apply pending rotation. */
-    webrtc::VideoFrame rotated_frame =
-        webrtc::VideoFrame::Builder()
-            .set_video_frame_buffer(webrtc::I420Buffer::Rotate(
-                *buffer->GetI420(), frame.rotation()))
-            .set_rotation(webrtc::kVideoRotation_0)
-            .set_timestamp_us(frame.timestamp_us())
-            .set_id(frame.id())
-            .build();
+    webrtc::VideoFrame rotated_frame(frame);
+    rotated_frame.set_video_frame_buffer(
+        webrtc::I420Buffer::Rotate(*buffer->GetI420(), frame.rotation()));
+    rotated_frame.set_rotation(webrtc::kVideoRotation_0);
     broadcaster_.OnFrame(rotated_frame);
   } else {
     broadcaster_.OnFrame(frame);
diff --git a/media/engine/simulcast_encoder_adapter.cc b/media/engine/simulcast_encoder_adapter.cc
index 1147d45be8..b7b2d7627e 100644
--- a/media/engine/simulcast_encoder_adapter.cc
+++ b/media/engine/simulcast_encoder_adapter.cc
@@ -420,12 +420,11 @@ int SimulcastEncoderAdapter::Encode(
 
       // UpdateRect is not propagated to lower simulcast layers currently.
       // TODO(ilnik): Consider scaling UpdateRect together with the buffer.
-      VideoFrame frame = VideoFrame::Builder()
-                             .set_video_frame_buffer(dst_buffer)
-                             .set_timestamp_rtp(input_image.timestamp())
-                             .set_rotation(webrtc::kVideoRotation_0)
-                             .set_timestamp_ms(input_image.render_time_ms())
-                             .build();
+      VideoFrame frame(input_image);
+      frame.set_video_frame_buffer(dst_buffer);
+      frame.set_rotation(webrtc::kVideoRotation_0);
+      frame.set_update_rect(
+          VideoFrame::UpdateRect{0, 0, frame.width(), frame.height()});
       int ret =
           streaminfos_[stream_idx].encoder->Encode(frame, &stream_frame_types);
       if (ret != WEBRTC_VIDEO_CODEC_OK) {
diff --git a/video/video_stream_decoder_impl.cc b/video/video_stream_decoder_impl.cc
index cc19f7ab7f..b4ae8488d9 100644
--- a/video/video_stream_decoder_impl.cc
+++ b/video/video_stream_decoder_impl.cc
@@ -280,15 +280,9 @@ void VideoStreamDecoderImpl::Decoded(VideoFrame& decoded_image,
     timing_.StopDecodeTimer(0, *casted_decode_time_ms, decode_stop_time_ms,
                             frame_timestamps->render_time_us / 1000);
 
-    callbacks_->OnDecodedFrame(
-        VideoFrame::Builder()
-            .set_video_frame_buffer(decoded_image.video_frame_buffer())
-            .set_rotation(decoded_image.rotation())
-            .set_timestamp_us(frame_timestamps->render_time_us)
-            .set_timestamp_rtp(decoded_image.timestamp())
-            .set_id(decoded_image.id())
-            .build(),
-        casted_decode_time_ms, casted_qp);
+    VideoFrame copy = decoded_image;
+    copy.set_timestamp_us(frame_timestamps->render_time_us);
+    callbacks_->OnDecodedFrame(copy, casted_decode_time_ms, casted_qp);
   });
 }
 
diff --git a/video/video_stream_encoder.cc b/video/video_stream_encoder.cc
index 013ad8f853..fab3d57068 100644
--- a/video/video_stream_encoder.cc
+++ b/video/video_stream_encoder.cc
@@ -1240,14 +1240,8 @@ void VideoStreamEncoder::EncodeVideoFrame(const VideoFrame& video_frame,
             VideoFrame::UpdateRect{0, 0, cropped_width, cropped_height};
       }
     }
-    out_frame = VideoFrame::Builder()
-                    .set_video_frame_buffer(cropped_buffer)
-                    .set_timestamp_rtp(video_frame.timestamp())
-                    .set_timestamp_ms(video_frame.render_time_ms())
-                    .set_rotation(video_frame.rotation())
-                    .set_id(video_frame.id())
-                    .set_update_rect(update_rect)
-                    .build();
+    out_frame.set_video_frame_buffer(cropped_buffer);
+    out_frame.set_update_rect(update_rect);
     out_frame.set_ntp_time_ms(video_frame.ntp_time_ms());
     // Since accumulated_update_rect_ is constructed before cropping,
     // we can't trust it. If any changes were pending, we invalidate whole
@@ -1322,14 +1316,8 @@ void VideoStreamEncoder::EncodeVideoFrame(const VideoFrame& video_frame,
           VideoFrame::UpdateRect{0, 0, out_frame.width(), out_frame.height()};
     }
 
-    out_frame = VideoFrame::Builder()
-                    .set_video_frame_buffer(converted_buffer)
-                    .set_timestamp_rtp(out_frame.timestamp())
-                    .set_timestamp_ms(out_frame.render_time_ms())
-                    .set_rotation(out_frame.rotation())
-                    .set_id(out_frame.id())
-                    .set_update_rect(update_rect)
-                    .build();
+    out_frame.set_video_frame_buffer(converted_buffer);
+    out_frame.set_update_rect(update_rect);
   }
 
   TRACE_EVENT1("webrtc", "VCMGenericEncoder::Encode", "timestamp",