Revert 6208 "Patch from henrike@webrtc.org"

Wasn't enough. I'll have to revert the whole rev 6202.

> Patch from henrike@webrtc.org
> https://code.google.com/p/webrtc/source/detail?r=6202
> didn't work for at least one file and broke most of 
> the compile steps in the FYI bots. The file is reverted
> here.
> 
> TBR= henrike@webrtc.org, sergeyu@webrtc.org
> 
> Review URL: https://webrtc-codereview.appspot.com/17609004

TBR=mcasas@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/14579006

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