This reverts commit eb648bf0e5a9bae185bcd6b4b3be371e1da3507d. Re-reverting to fix original CL (https://codereview.webrtc.org/1715673002/). TBR=stefan@webrtc.org, tommi@webrtc.org, torbjorng@webrtc.org BUG=webrtc:5514 Review URL: https://codereview.webrtc.org/1769113003 Cr-Commit-Position: refs/heads/master@{#11904}