65f74a1fc6094fd3cf7eb61982d3a837f1d9ed03

This reverts commit 8e9c67e6a92b595fa18348e82042f439153321e3.
- 8e9c67e6a9
BUG=4488,4473
TBR=kjellander@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/47869004
Cr-Commit-Position: refs/heads/master@{#8895}
Description
No description provided
Languages
C++
88.6%
C
3.3%
Java
3%
Objective-C++
1.9%
Python
1.9%
Other
1%