diff --git a/api/optional.h b/api/optional.h
index 7a62335733..9221f2c0b5 100644
--- a/api/optional.h
+++ b/api/optional.h
@@ -281,12 +281,6 @@ class Optional final {
                       : default_val;
   }
 
-  // Dereference and move value.
-  T MoveValue() {
-    RTC_DCHECK(has_value_);
-    return std::move(value_);
-  }
-
   // Equality tests. Two Optionals are equal if they contain equivalent values,
   // or if they're both empty.
   friend bool operator==(const Optional& m1, const Optional& m2) {
diff --git a/api/optional_unittest.cc b/api/optional_unittest.cc
index 2149033f40..ad700dc001 100644
--- a/api/optional_unittest.cc
+++ b/api/optional_unittest.cc
@@ -861,7 +861,7 @@ TEST(OptionalTest, TestMoveValue) {
   {
     Optional<Logger> x(Logger(42));
     log->push_back("---");
-    Logger moved = x.MoveValue();
+    Logger moved = std::move(x.value());
     log->push_back("---");
   }
   EXPECT_EQ(
diff --git a/ortc/rtpparametersconversion.cc b/ortc/rtpparametersconversion.cc
index 0a657eca8f..1c336e2996 100644
--- a/ortc/rtpparametersconversion.cc
+++ b/ortc/rtpparametersconversion.cc
@@ -330,7 +330,7 @@ RtpCodecCapability ToRtpCodecCapability(const C& cricket_codec) {
        cricket_codec.feedback_params.params()) {
     rtc::Optional<RtcpFeedback> feedback = ToRtcpFeedback(cricket_feedback);
     if (feedback) {
-      codec.rtcp_feedback.push_back(feedback.MoveValue());
+      codec.rtcp_feedback.push_back(feedback.value());
     }
   }
   ToRtpCodecCapabilityTypeSpecific(cricket_codec, &codec);
@@ -370,7 +370,7 @@ RtpCodecParameters ToRtpCodecParameters(const C& cricket_codec) {
        cricket_codec.feedback_params.params()) {
     rtc::Optional<RtcpFeedback> feedback = ToRtcpFeedback(cricket_feedback);
     if (feedback) {
-      codec_param.rtcp_feedback.push_back(feedback.MoveValue());
+      codec_param.rtcp_feedback.push_back(feedback.value());
     }
   }
   ToRtpCodecParametersTypeSpecific(cricket_codec, &codec_param);