diff --git a/api/video_codecs/video_encoder.cc b/api/video_codecs/video_encoder.cc
index 558022b54f..056a4cbc0d 100644
--- a/api/video_codecs/video_encoder.cc
+++ b/api/video_codecs/video_encoder.cc
@@ -95,10 +95,6 @@ VideoEncoder::ScalingSettings VideoEncoder::GetScalingSettings() const {
   return ScalingSettings::kOff;
 }
 
-int32_t VideoEncoder::SetPeriodicKeyFrames(bool enable) {
-  return -1;
-}
-
 bool VideoEncoder::SupportsNativeHandle() const {
   return false;
 }
diff --git a/api/video_codecs/video_encoder.h b/api/video_codecs/video_encoder.h
index 6dee102d0e..583c8acc51 100644
--- a/api/video_codecs/video_encoder.h
+++ b/api/video_codecs/video_encoder.h
@@ -204,7 +204,6 @@ class VideoEncoder {
   // quality scaler must implement this method.
   virtual ScalingSettings GetScalingSettings() const;
 
-  virtual int32_t SetPeriodicKeyFrames(bool enable);
   virtual bool SupportsNativeHandle() const;
   virtual const char* ImplementationName() const;
 };
diff --git a/media/engine/scopedvideoencoder.cc b/media/engine/scopedvideoencoder.cc
index 0f563641f6..41d3bb05a5 100644
--- a/media/engine/scopedvideoencoder.cc
+++ b/media/engine/scopedvideoencoder.cc
@@ -37,7 +37,6 @@ class ScopedVideoEncoder : public webrtc::VideoEncoder {
   int32_t SetRateAllocation(const webrtc::BitrateAllocation& allocation,
                             uint32_t framerate) override;
   ScalingSettings GetScalingSettings() const override;
-  int32_t SetPeriodicKeyFrames(bool enable) override;
   bool SupportsNativeHandle() const override;
   const char* ImplementationName() const override;
 
@@ -95,10 +94,6 @@ webrtc::VideoEncoder::ScalingSettings ScopedVideoEncoder::GetScalingSettings()
   return encoder_->GetScalingSettings();
 }
 
-int32_t ScopedVideoEncoder::SetPeriodicKeyFrames(bool enable) {
-  return encoder_->SetPeriodicKeyFrames(enable);
-}
-
 bool ScopedVideoEncoder::SupportsNativeHandle() const {
   return encoder_->SupportsNativeHandle();
 }
diff --git a/media/engine/vp8_encoder_simulcast_proxy.cc b/media/engine/vp8_encoder_simulcast_proxy.cc
index b97e74e5ef..283f17bb94 100644
--- a/media/engine/vp8_encoder_simulcast_proxy.cc
+++ b/media/engine/vp8_encoder_simulcast_proxy.cc
@@ -69,10 +69,6 @@ VideoEncoder::ScalingSettings VP8EncoderSimulcastProxy::GetScalingSettings()
   return encoder_->GetScalingSettings();
 }
 
-int32_t VP8EncoderSimulcastProxy::SetPeriodicKeyFrames(bool enable) {
-  return encoder_->SetPeriodicKeyFrames(enable);
-}
-
 bool VP8EncoderSimulcastProxy::SupportsNativeHandle() const {
   return encoder_->SupportsNativeHandle();
 }
diff --git a/media/engine/vp8_encoder_simulcast_proxy.h b/media/engine/vp8_encoder_simulcast_proxy.h
index 5833124c50..d32f9b22ed 100644
--- a/media/engine/vp8_encoder_simulcast_proxy.h
+++ b/media/engine/vp8_encoder_simulcast_proxy.h
@@ -42,7 +42,6 @@ class VP8EncoderSimulcastProxy : public VP8Encoder {
 
   VideoEncoder::ScalingSettings GetScalingSettings() const override;
 
-  int32_t SetPeriodicKeyFrames(bool enable) override;
   bool SupportsNativeHandle() const override;
   const char* ImplementationName() const override;
 
diff --git a/modules/video_coding/codecs/h264/h264_encoder_impl.cc b/modules/video_coding/codecs/h264/h264_encoder_impl.cc
index 83a29ed6b7..b248f9982c 100644
--- a/modules/video_coding/codecs/h264/h264_encoder_impl.cc
+++ b/modules/video_coding/codecs/h264/h264_encoder_impl.cc
@@ -502,10 +502,6 @@ int32_t H264EncoderImpl::SetChannelParameters(
   return WEBRTC_VIDEO_CODEC_OK;
 }
 
-int32_t H264EncoderImpl::SetPeriodicKeyFrames(bool enable) {
-  return WEBRTC_VIDEO_CODEC_OK;
-}
-
 VideoEncoder::ScalingSettings H264EncoderImpl::GetScalingSettings() const {
   return VideoEncoder::ScalingSettings(kLowH264QpThreshold,
                                        kHighH264QpThreshold);
diff --git a/modules/video_coding/codecs/h264/h264_encoder_impl.h b/modules/video_coding/codecs/h264/h264_encoder_impl.h
index c9b45d0a62..20d5ea6056 100644
--- a/modules/video_coding/codecs/h264/h264_encoder_impl.h
+++ b/modules/video_coding/codecs/h264/h264_encoder_impl.h
@@ -59,7 +59,6 @@ class H264EncoderImpl : public H264Encoder {
 
   // Unsupported / Do nothing.
   int32_t SetChannelParameters(uint32_t packet_loss, int64_t rtt) override;
-  int32_t SetPeriodicKeyFrames(bool enable) override;
 
   // Exposed for testing.
   H264PacketizationMode PacketizationModeForTesting() const {
diff --git a/modules/video_coding/encoder_database.cc b/modules/video_coding/encoder_database.cc
index 60e640a20d..1bf7d4d6db 100644
--- a/modules/video_coding/encoder_database.cc
+++ b/modules/video_coding/encoder_database.cc
@@ -23,7 +23,6 @@ VCMEncoderDataBase::VCMEncoderDataBase(
     VCMEncodedFrameCallback* encoded_frame_callback)
     : number_of_cores_(0),
       max_payload_size_(kDefaultPayloadSize),
-      periodic_key_frames_(false),
       pending_encoder_reset_(true),
       send_codec_(),
       encoder_payload_type_(0),
@@ -101,11 +100,6 @@ bool VCMEncoderDataBase::SetSendCodec(const VideoCodec* send_codec,
     return false;
   }
 
-  // Intentionally don't check return value since the encoder registration
-  // shouldn't fail because the codec doesn't support changing the periodic key
-  // frame setting.
-  ptr_encoder_->SetPeriodicKeyFrames(periodic_key_frames_);
-
   pending_encoder_reset_ = false;
 
   return true;
@@ -211,14 +205,6 @@ VCMGenericEncoder* VCMEncoderDataBase::GetEncoder() {
   return ptr_encoder_.get();
 }
 
-bool VCMEncoderDataBase::SetPeriodicKeyFrames(bool enable) {
-  periodic_key_frames_ = enable;
-  if (ptr_encoder_) {
-    return (ptr_encoder_->SetPeriodicKeyFrames(periodic_key_frames_) == 0);
-  }
-  return true;
-}
-
 void VCMEncoderDataBase::DeleteEncoder() {
   if (!ptr_encoder_)
     return;
diff --git a/modules/video_coding/encoder_database.h b/modules/video_coding/encoder_database.h
index 2753c7bd2e..61e0720351 100644
--- a/modules/video_coding/encoder_database.h
+++ b/modules/video_coding/encoder_database.h
@@ -44,8 +44,6 @@ class VCMEncoderDataBase {
 
   VCMGenericEncoder* GetEncoder();
 
-  bool SetPeriodicKeyFrames(bool enable);
-
   bool MatchesCurrentResolution(int width, int height) const;
 
  private:
@@ -57,7 +55,6 @@ class VCMEncoderDataBase {
 
   int number_of_cores_;
   size_t max_payload_size_;
-  bool periodic_key_frames_;
   bool pending_encoder_reset_;
   VideoCodec send_codec_;
   uint8_t encoder_payload_type_;
diff --git a/modules/video_coding/generic_encoder.cc b/modules/video_coding/generic_encoder.cc
index d1816e0acc..034fe0330b 100644
--- a/modules/video_coding/generic_encoder.cc
+++ b/modules/video_coding/generic_encoder.cc
@@ -151,11 +151,6 @@ EncoderParameters VCMGenericEncoder::GetEncoderParameters() const {
   return encoder_params_;
 }
 
-int32_t VCMGenericEncoder::SetPeriodicKeyFrames(bool enable) {
-  RTC_DCHECK_RUNS_SERIALIZED(&race_checker_);
-  return encoder_->SetPeriodicKeyFrames(enable);
-}
-
 int32_t VCMGenericEncoder::RequestFrame(
     const std::vector<FrameType>& frame_types) {
   RTC_DCHECK_RUNS_SERIALIZED(&race_checker_);
diff --git a/modules/video_coding/generic_encoder.h b/modules/video_coding/generic_encoder.h
index 244c61444e..d859933a4b 100644
--- a/modules/video_coding/generic_encoder.h
+++ b/modules/video_coding/generic_encoder.h
@@ -134,7 +134,6 @@ class VCMGenericEncoder {
   void SetEncoderParameters(const EncoderParameters& params);
   EncoderParameters GetEncoderParameters() const;
 
-  int32_t SetPeriodicKeyFrames(bool enable);
   int32_t RequestFrame(const std::vector<FrameType>& frame_types);
   bool InternalSource() const;
   bool SupportsNativeHandle() const;
diff --git a/modules/video_coding/include/mock/mock_video_codec_interface.h b/modules/video_coding/include/mock/mock_video_codec_interface.h
index 2fc3bc4749..e558b7ce9e 100644
--- a/modules/video_coding/include/mock/mock_video_codec_interface.h
+++ b/modules/video_coding/include/mock/mock_video_codec_interface.h
@@ -48,7 +48,6 @@ class MockVideoEncoder : public VideoEncoder {
   MOCK_METHOD2(SetRateAllocation,
                int32_t(const BitrateAllocation& newBitRate,
                        uint32_t frameRate));
-  MOCK_METHOD1(SetPeriodicKeyFrames, int32_t(bool enable));
 };
 
 class MockDecodedImageCallback : public DecodedImageCallback {
diff --git a/test/configurable_frame_size_encoder.cc b/test/configurable_frame_size_encoder.cc
index cbfb35bf33..f09be533af 100644
--- a/test/configurable_frame_size_encoder.cc
+++ b/test/configurable_frame_size_encoder.cc
@@ -79,10 +79,6 @@ int32_t ConfigurableFrameSizeEncoder::SetRateAllocation(
   return WEBRTC_VIDEO_CODEC_OK;
 }
 
-int32_t ConfigurableFrameSizeEncoder::SetPeriodicKeyFrames(bool enable) {
-  return WEBRTC_VIDEO_CODEC_OK;
-}
-
 int32_t ConfigurableFrameSizeEncoder::SetFrameSize(size_t size) {
   RTC_DCHECK_LE(size, max_frame_size_);
   current_frame_size_ = size;
diff --git a/test/configurable_frame_size_encoder.h b/test/configurable_frame_size_encoder.h
index 8d3cbc65af..f3733c8369 100644
--- a/test/configurable_frame_size_encoder.h
+++ b/test/configurable_frame_size_encoder.h
@@ -42,8 +42,6 @@ class ConfigurableFrameSizeEncoder : public VideoEncoder {
   int32_t SetRateAllocation(const BitrateAllocation& allocation,
                             uint32_t framerate) override;
 
-  int32_t SetPeriodicKeyFrames(bool enable) override;
-
   int32_t SetFrameSize(size_t size);
 
  private: