This reverts commit e41d774c4d.
Original code review: https://webrtc-codereview.appspot.com/43999004/
Reason for reland: There was nothing wrong with this cl as is, but it breaks chrome compatibility. We will now reland this and fix Chrome during roll.
Patset 1: Original cl.
Patchset 2: Removed more code that is no longer needed.
R=magjed@webrtc.org, pbos@webrtc.org
TBR=mflodman@webrtc.org
BUG=1128
Review URL: https://webrtc-codereview.appspot.com/45049004
Cr-Commit-Position: refs/heads/master@{#8956}