diff --git a/ortc/BUILD.gn b/ortc/BUILD.gn
index be7b1fbdec..d0fb00f5ca 100644
--- a/ortc/BUILD.gn
+++ b/ortc/BUILD.gn
@@ -14,7 +14,6 @@ if (is_android) {
 
 rtc_static_library("ortc") {
   defines = []
-  configs += [ "..:no_exit_time_destructors" ]
   sources = [
     "ortcfactory.cc",
     "ortcfactory.h",
diff --git a/ortc/rtptransportcontrolleradapter.cc b/ortc/rtptransportcontrolleradapter.cc
index e4c9ea24d2..853adf1274 100644
--- a/ortc/rtptransportcontrolleradapter.cc
+++ b/ortc/rtptransportcontrolleradapter.cc
@@ -626,9 +626,8 @@ RtpTransportControllerAdapter::RtpTransportControllerAdapter(
   // currently reject empty lists of codecs. Note that these codecs will never
   // actually be used, because when parameters are set, the dummy codecs will
   // be replaced by actual codecs before any send/receive streams are created.
-  static const cricket::AudioCodec dummy_audio(0, cricket::kPcmuCodecName, 8000,
-                                               0, 1);
-  static const cricket::VideoCodec dummy_video(96, cricket::kVp8CodecName);
+  const cricket::AudioCodec dummy_audio(0, cricket::kPcmuCodecName, 8000, 0, 1);
+  const cricket::VideoCodec dummy_video(96, cricket::kVp8CodecName);
   local_audio_description_.AddCodec(dummy_audio);
   remote_audio_description_.AddCodec(dummy_audio);
   local_video_description_.AddCodec(dummy_video);