diff --git a/api/mediaconstraintsinterface.cc b/api/mediaconstraintsinterface.cc
index 2894f5b23d..90a957cfa4 100644
--- a/api/mediaconstraintsinterface.cc
+++ b/api/mediaconstraintsinterface.cc
@@ -67,7 +67,7 @@ void ConstraintToOptional(const webrtc::MediaConstraintsInterface* constraints,
   T value;
   bool present = FindConstraint<T>(constraints, key, &value, nullptr);
   if (present) {
-    *value_out = rtc::Optional<T>(value);
+    *value_out = value;
   }
 }
 }  // namespace
@@ -268,7 +268,7 @@ void CopyConstraintsIntoAudioOptions(
   // When |kAudioNetworkAdaptorConfig| is defined, it both means that audio
   // network adaptor is desired, and provides the config string.
   if (options->audio_network_adaptor_config) {
-    options->audio_network_adaptor = rtc::Optional<bool>(true);
+    options->audio_network_adaptor = true;
   }
 }
 
diff --git a/api/video_codecs/video_encoder.cc b/api/video_codecs/video_encoder.cc
index e3cc516d6f..e1cc0cfac7 100644
--- a/api/video_codecs/video_encoder.cc
+++ b/api/video_codecs/video_encoder.cc
@@ -61,15 +61,14 @@ VideoCodecH264 VideoEncoder::GetDefaultH264Settings() {
 }
 
 VideoEncoder::ScalingSettings::ScalingSettings(bool on, int low, int high)
-    : enabled(on),
-      thresholds(rtc::Optional<QpThresholds>(QpThresholds(low, high))) {}
+    : enabled(on), thresholds(QpThresholds(low, high)) {}
 
 VideoEncoder::ScalingSettings::ScalingSettings(bool on,
                                                int low,
                                                int high,
                                                int min_pixels)
     : enabled(on),
-      thresholds(rtc::Optional<QpThresholds>(QpThresholds(low, high))),
+      thresholds(QpThresholds(low, high)),
       min_pixels_per_frame(min_pixels) {}
 
 VideoEncoder::ScalingSettings::ScalingSettings(bool on, int min_pixels)