0828a0c09440cb7edbfacc94d362bf08414c7655

This reverts commit 903c0f2e7649a2b98659286dc228447facd49bb7, aka #8899. TBR=pbos@webrtc.org Review URL: https://webrtc-codereview.appspot.com/46759004 Cr-Commit-Position: refs/heads/master@{#8901}
Description
No description provided
Languages
C++
88.6%
C
3.3%
Java
3%
Objective-C++
1.9%
Python
1.9%
Other
1%