Revert reason: I unintentionally added a patch when rebasing that is breaking the bots. This reverts commit 98c69a0ee785adeb9d95fffeb55cdb6cedbe82c6. BUG= Review URL: https://codereview.webrtc.org/1837313002 . Cr-Commit-Position: refs/heads/master@{#12148}