4bf12eafba4e18504ac22080262dba61b4c8b9e7

This reverts commit f65de8483e90d1d52d5d8f40f646e77bf45b10ea. It was breaking the build bots: http://build.chromium.org/p/client.webrtc/builders/Win%20DrMemory%20Light/builds/3062 TBR=decurtis BUG= Review URL: https://webrtc-codereview.appspot.com/54539004 Cr-Commit-Position: refs/heads/master@{#9267}
Description
No description provided
Languages
C++
88.6%
C
3.3%
Java
3%
Objective-C++
1.9%
Python
1.9%
Other
1%