
This reverts commit cdb47a4533b7b1e29e803ed6591a68bb1a4f1692. Contains a tentative fix to the chrome build breakage caused by the original change. TBR=mflodman@webrtc.org Review URL: https://webrtc-codereview.appspot.com/47139004 Cr-Commit-Position: refs/heads/master@{#9164}