| Index: webrtc/media/engine/webrtcvideoengine2.cc
 | 
| diff --git a/webrtc/media/engine/webrtcvideoengine2.cc b/webrtc/media/engine/webrtcvideoengine2.cc
 | 
| index e92598d408d53e057a3b61bb815f18f854afde42..0154c3d4a870935c911a0a0b3804c8728327029e 100644
 | 
| --- a/webrtc/media/engine/webrtcvideoengine2.cc
 | 
| +++ b/webrtc/media/engine/webrtcvideoengine2.cc
 | 
| @@ -1257,8 +1257,6 @@ void WebRtcVideoChannel2::ConfigureReceiverRtp(
 | 
|  
 | 
|    sp.GetFidSsrc(ssrc, &config->rtp.rtx_ssrc);
 | 
|  
 | 
| -  config->rtp.extensions = recv_rtp_extensions_;
 | 
| -
 | 
|    // TODO(brandtr): Generalize when we add support for multistream protection.
 | 
|    if (sp.GetFecFrSsrc(ssrc, &flexfec_config->remote_ssrc)) {
 | 
|      flexfec_config->protected_media_ssrcs = {ssrc};
 | 
| @@ -1267,7 +1265,6 @@ void WebRtcVideoChannel2::ConfigureReceiverRtp(
 | 
|      // TODO(brandtr): We should be spec-compliant and set |transport_cc| here
 | 
|      // based on the rtcp-fb for the FlexFEC codec, not the media codec.
 | 
|      flexfec_config->transport_cc = config->rtp.transport_cc;
 | 
| -    flexfec_config->rtp_header_extensions = config->rtp.extensions;
 | 
|    }
 | 
|  }
 | 
|  
 | 
| @@ -2326,11 +2323,6 @@ void WebRtcVideoChannel2::WebRtcVideoReceiveStream::SetRecvParameters(
 | 
|      ConfigureCodecs(*params.codec_settings, &old_decoders);
 | 
|      needs_recreation = true;
 | 
|    }
 | 
| -  if (params.rtp_header_extensions) {
 | 
| -    config_.rtp.extensions = *params.rtp_header_extensions;
 | 
| -    flexfec_config_.rtp_header_extensions = *params.rtp_header_extensions;
 | 
| -    needs_recreation = true;
 | 
| -  }
 | 
|    if (needs_recreation) {
 | 
|      LOG(LS_INFO) << "RecreateWebRtcStream (recv) because of SetRecvParameters";
 | 
|      RecreateWebRtcStream();
 | 
| 
 |