Reverting r2812

TBR=mflodman
Review URL: https://webrtc-codereview.appspot.com/829007

git-svn-id: http://webrtc.googlecode.com/svn/trunk@2816 4adac7df-926f-26a2-2b94-8c16560cd09d
13 files changed