Revert of 6211 as it was committed despite of PRESUBMIT.py warning. The commit breaks the sync bot.

BUG=N/A
TBR=mcasas@webrtc.org

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

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