This reverts commit 9c38c2d33fa6d794704d53b18f39d5235439fe63. This commit somehow is different from what I have in my local copy. Revert and will recommit. TBR=pthatcher@webrtc.org BUG=3618 Review URL: https://codereview.webrtc.org/1494373004 . Cr-Commit-Position: refs/heads/master@{#10902}