diff --git a/api/video/encoded_frame.h b/api/video/encoded_frame.h
index 1373eaa19d..44a14306f5 100644
--- a/api/video/encoded_frame.h
+++ b/api/video/encoded_frame.h
@@ -19,11 +19,6 @@
 namespace webrtc {
 namespace video_coding {
 
-// TODO(bugs.webrtc.org/12206): Remove when downstream has been updated.
-struct VideoLayerFrameId {
-  int64_t picture_id = -1;
-};
-
 // TODO(philipel): Remove webrtc::VCMEncodedFrame inheritance.
 // TODO(philipel): Move transport specific info out of EncodedFrame.
 // NOTE: This class is still under development and may change without notice.
@@ -48,12 +43,8 @@ class EncodedFrame : public webrtc::VCMEncodedFrame {
 
   bool is_keyframe() const { return num_references == 0; }
 
-  // TODO(bugs.webrtc.org/12206): Replace with private int64_t when downstream
-  //                              has been updated.
-  VideoLayerFrameId id;
-
-  void SetId(int64_t frame_id) { id.picture_id = frame_id; }
-  int64_t Id() const { return id.picture_id; }
+  void SetId(int64_t id) { id_ = id; }
+  int64_t Id() const { return id_; }
 
   // TODO(philipel): Add simple modify/access functions to prevent adding too
   // many |references|.
@@ -62,6 +53,11 @@ class EncodedFrame : public webrtc::VCMEncodedFrame {
   // Is this subframe the last one in the superframe (In RTP stream that would
   // mean that the last packet has a marker bit set).
   bool is_last_spatial_layer = true;
+
+ private:
+  // The ID of the frame is determined from RTP level information. The IDs are
+  // used to describe order and dependencies between frames.
+  int64_t id_ = -1;
 };
 
 }  // namespace video_coding
diff --git a/api/video/video_stream_decoder.h b/api/video/video_stream_decoder.h
index 268ef5aef6..a1f440688a 100644
--- a/api/video/video_stream_decoder.h
+++ b/api/video/video_stream_decoder.h
@@ -38,10 +38,6 @@ class VideoStreamDecoderInterface {
     // Called when the VideoStreamDecoder enters a non-decodable state.
     virtual void OnNonDecodableState() = 0;
 
-    // TODO(bugs.webrtc.org/12206): Remove when downstream has been updated.
-    virtual void OnContinuousUntil(const video_coding::VideoLayerFrameId& key) {
-    }
-
     virtual void OnContinuousUntil(int64_t frame_id) {}
 
     virtual void OnDecodedFrame(VideoFrame frame,