New attempt to revert r2362, since drover failed.

TBR=stefan@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/640005

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