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