Cleaning up r7562-7567.

Wrongly used git svn dcommit for committing a CL.

Then two reverts were applied.

Still something needs to be cleaned.

BUG=

TBR=kjellander@webrtc.org

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

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