This reverts commit 93adc3209b5ff10adaba54d5eab6b53bc2780685. Reverted originally because it depended on a CL which was reverted. That CL has been reinstated in: https: //chromium-review.googlesource.com/#/c/572070/ Bug: webrtc:7969 Change-Id: I608bbeaaba02e84908433c8260cf236df0307a97 Reviewed-on: https://chromium-review.googlesource.com/572405 Reviewed-by: Zeke Chin <tkchin@webrtc.org> Cr-Commit-Position: refs/heads/master@{#19035}