This reverts commit 26d5e2e2809558148dc1e977ec1bc8318a2047bc. Reverted originally because it dependend on a CL which was reverted. That CL has been reinstated in: https://chromium-review.googlesource.com/#/c/572070/ Bug: webrtc:7969 Change-Id: I404c3a42ad447312d981646dca0aa4cf0ec3134e Reviewed-on: https://chromium-review.googlesource.com/572403 Reviewed-by: Taylor Brandstetter <deadbeef@webrtc.org> Cr-Commit-Position: refs/heads/master@{#19034}