This partially revers commit 1ee9160a2e0bc6381caca2b8c42f7ce5507619bc No-Try: True Bug: chromium:888417 Change-Id: I72b4f95235d5132e8e82065ce2a78329d2f42f52 Reviewed-on: https://webrtc-review.googlesource.com/102621 Commit-Queue: Oleh Prypin <oprypin@webrtc.org> Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> Cr-Commit-Position: refs/heads/master@{#24893}