diff --git a/media/engine/webrtc_voice_engine.cc b/media/engine/webrtc_voice_engine.cc
index 749f2506a5..41308bafa6 100644
--- a/media/engine/webrtc_voice_engine.cc
+++ b/media/engine/webrtc_voice_engine.cc
@@ -581,7 +581,6 @@ bool WebRtcVoiceEngine::ApplyOptions(const AudioOptions& options_in) {
     apm_config.voice_detection.enabled = *options.typing_detection;
   }
 
-  ap->SetExtraOptions(config);
   ap->ApplyConfig(apm_config);
   return true;
 }
diff --git a/media/engine/webrtc_voice_engine_unittest.cc b/media/engine/webrtc_voice_engine_unittest.cc
index 1bd631f14d..30109748bb 100644
--- a/media/engine/webrtc_voice_engine_unittest.cc
+++ b/media/engine/webrtc_voice_engine_unittest.cc
@@ -155,7 +155,6 @@ TEST(WebRtcVoiceEngineTestStubLibrary, StartupShutdown) {
     if (!use_null_apm) {
       EXPECT_CALL(*apm, GetConfig()).WillRepeatedly(ReturnPointee(&apm_config));
       EXPECT_CALL(*apm, ApplyConfig(_)).WillRepeatedly(SaveArg<0>(&apm_config));
-      EXPECT_CALL(*apm, SetExtraOptions(::testing::_));
       EXPECT_CALL(*apm, DetachAecDump());
     }
     {
@@ -200,7 +199,6 @@ class WebRtcVoiceEngineTestFake : public ::testing::TestWithParam<bool> {
           .WillRepeatedly(ReturnPointee(&apm_config_));
       EXPECT_CALL(*apm_, ApplyConfig(_))
           .WillRepeatedly(SaveArg<0>(&apm_config_));
-      EXPECT_CALL(*apm_, SetExtraOptions(::testing::_));
       EXPECT_CALL(*apm_, DetachAecDump());
     }
 
@@ -230,9 +228,6 @@ class WebRtcVoiceEngineTestFake : public ::testing::TestWithParam<bool> {
   }
 
   bool SetupChannel() {
-    if (!use_null_apm_) {
-      EXPECT_CALL(*apm_, SetExtraOptions(::testing::_));
-    }
     channel_ = engine_->CreateMediaChannel(&call_, cricket::MediaConfig(),
                                            cricket::AudioOptions(),
                                            webrtc::CryptoOptions());
@@ -310,17 +305,11 @@ class WebRtcVoiceEngineTestFake : public ::testing::TestWithParam<bool> {
       EXPECT_CALL(*adm_, RecordingIsInitialized()).WillOnce(Return(false));
       EXPECT_CALL(*adm_, Recording()).WillOnce(Return(false));
       EXPECT_CALL(*adm_, InitRecording()).WillOnce(Return(0));
-      if (!use_null_apm_) {
-        EXPECT_CALL(*apm_, SetExtraOptions(::testing::_));
-      }
     }
     channel_->SetSend(enable);
   }
 
   void SetSendParameters(const cricket::AudioSendParameters& params) {
-    if (!use_null_apm_) {
-      EXPECT_CALL(*apm_, SetExtraOptions(::testing::_));
-    }
     ASSERT_TRUE(channel_);
     EXPECT_TRUE(channel_->SetSendParameters(params));
   }
@@ -332,9 +321,6 @@ class WebRtcVoiceEngineTestFake : public ::testing::TestWithParam<bool> {
     ASSERT_TRUE(channel_);
     if (!use_null_apm_) {
       EXPECT_CALL(*apm_, set_output_will_be_muted(!enable));
-      if (enable && options) {
-        EXPECT_CALL(*apm_, SetExtraOptions(::testing::_));
-      }
     }
     EXPECT_TRUE(channel_->SetAudioSend(ssrc, enable, options, source));
   }
@@ -3071,9 +3057,6 @@ TEST_P(WebRtcVoiceEngineTestFake, SetOptionOverridesViaChannels) {
 
   EXPECT_CALL(*adm_, Recording()).Times(2).WillRepeatedly(Return(false));
   EXPECT_CALL(*adm_, InitRecording()).Times(2).WillRepeatedly(Return(0));
-  if (!use_null_apm_) {
-    EXPECT_CALL(*apm_, SetExtraOptions(::testing::_)).Times(10);
-  }
 
   std::unique_ptr<cricket::WebRtcVoiceMediaChannel> channel1(
       static_cast<cricket::WebRtcVoiceMediaChannel*>(
@@ -3193,10 +3176,6 @@ TEST_P(WebRtcVoiceEngineTestFake, TestSetDscpOptions) {
   std::unique_ptr<cricket::WebRtcVoiceMediaChannel> channel;
   webrtc::RtpParameters parameters;
 
-  if (!use_null_apm_) {
-    EXPECT_CALL(*apm_, SetExtraOptions(::testing::_)).Times(3);
-  }
-
   channel.reset(static_cast<cricket::WebRtcVoiceMediaChannel*>(
       engine_->CreateMediaChannel(&call_, config, cricket::AudioOptions(),
                                   webrtc::CryptoOptions())));
diff --git a/modules/audio_processing/audio_processing_performance_unittest.cc b/modules/audio_processing/audio_processing_performance_unittest.cc
index 206812b0cb..86ff0e8bfe 100644
--- a/modules/audio_processing/audio_processing_performance_unittest.cc
+++ b/modules/audio_processing/audio_processing_performance_unittest.cc
@@ -497,7 +497,6 @@ class CallSimulator : public ::testing::TestWithParam<SimulationConfig> {
         apm_.reset(AudioProcessingBuilderForTesting().Create(config));
         ASSERT_TRUE(!!apm_);
         set_default_desktop_apm_runtime_settings(apm_.get());
-        apm_->SetExtraOptions(config);
         break;
       }
       case SettingsType::kAllSubmodulesTurnedOff: {
@@ -511,7 +510,6 @@ class CallSimulator : public ::testing::TestWithParam<SimulationConfig> {
         apm_.reset(AudioProcessingBuilderForTesting().Create(config));
         ASSERT_TRUE(!!apm_);
         set_default_desktop_apm_runtime_settings(apm_.get());
-        apm_->SetExtraOptions(config);
         break;
       }
       case SettingsType::kDefaultApmDesktopWithoutExtendedFilter: {
@@ -519,7 +517,6 @@ class CallSimulator : public ::testing::TestWithParam<SimulationConfig> {
         apm_.reset(AudioProcessingBuilderForTesting().Create(config));
         ASSERT_TRUE(!!apm_);
         set_default_desktop_apm_runtime_settings(apm_.get());
-        apm_->SetExtraOptions(config);
         break;
       }
     }
diff --git a/modules/audio_processing/test/aec_dump_based_simulator.cc b/modules/audio_processing/test/aec_dump_based_simulator.cc
index 49372a9c28..0e914320e3 100644
--- a/modules/audio_processing/test/aec_dump_based_simulator.cc
+++ b/modules/audio_processing/test/aec_dump_based_simulator.cc
@@ -287,7 +287,6 @@ void AecDumpBasedSimulator::HandleMessage(
     if (settings_.use_verbose_logging) {
       std::cout << "Setting used in config:" << std::endl;
     }
-    Config config;
     AudioProcessing::Config apm_config = ap_->GetConfig();
 
     if (msg.has_aec_enabled() || settings_.use_aec) {
@@ -438,7 +437,6 @@ void AecDumpBasedSimulator::HandleMessage(
     }
 
     ap_->ApplyConfig(apm_config);
-    ap_->SetExtraOptions(config);
   }
 }