![perkj@webrtc.org](/assets/img/avatar_default.png)
This reverts commit b8bcf8cbbf84971e2ae26d91659afdc58617b054. after I fixed a rebase mistake. The fix is the delta between patchset 1 and 2. The original cl was reviewed here: https://webrtc-codereview.appspot.com/40759004/ TBR=magjed@webrtc.org BUG=4145 Review URL: https://webrtc-codereview.appspot.com/45409004 Cr-Commit-Position: refs/heads/master@{#8538} git-svn-id: http://webrtc.googlecode.com/svn/trunk@8538 4adac7df-926f-26a2-2b94-8c16560cd09d