patchset #8 id:300001 of https://codereview.webrtc.org/2003623003/ This reverts commit 2b9423f7a18145255deb93f2505a4fd1c3fa9ad7. BUG=webrtc:5530 TBR=peah@webrtc.org, kjellander@webrtc.org Review-Url: https://codereview.webrtc.org/2063643003 Cr-Commit-Position: refs/heads/master@{#13132}