1 files changed, 1 insertions, 10 deletions
diff --git a/modules/video_coding/video_codec_initializer.cc b/modules/video_coding/video_codec_initializer.cc
index 79421ff3e4..6098f59fe9 100644
--- a/modules/video_coding/video_codec_initializer.cc
+++ b/modules/video_coding/video_codec_initializer.cc
@@ -236,18 +236,9 @@ VideoCodec VideoCodecInitializer::VideoEncoderConfigToVideoCodec(
       if (!config.spatial_layers.empty()) {
         // Layering is set explicitly.
         spatial_layers = config.spatial_layers;
-      } else if (scalability_mode.has_value()) {
+      } else if (video_codec.GetScalabilityMode().has_value()) {
         // Layering is set via scalability mode.
         spatial_layers = GetVp9SvcConfig(video_codec);
-        if (spatial_layers.empty())
-          break;
-        // Use codec bitrate limits if spatial layering is not requested.
-        if (video_codec.numberOfSimulcastStreams <= 1 &&
-            ScalabilityModeToNumSpatialLayers(*scalability_mode) == 1) {
-          spatial_layers.back().minBitrate = video_codec.minBitrate;
-          spatial_layers.back().targetBitrate = video_codec.maxBitrate;
-          spatial_layers.back().maxBitrate = video_codec.maxBitrate;
-        }
       } else {
         size_t first_active_layer = 0;
         for (size_t spatial_idx = 0;