This reverts commit ece3c228a2cbd1c1b05eee3a7f55dbb6f020acbc. Reason: Breaks downstream project. Bug: webrtc:8111 Change-Id: Ia264802b35a576d74b8a249ed742a8177e5cbe24 No-Try: true Reviewed-on: https://webrtc-review.googlesource.com/c/107721 Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> Reviewed-by: Björn Terelius <terelius@webrtc.org> Cr-Commit-Position: refs/heads/master@{#25340}