The change was reverted since it was thought to cause a flaky test. But the test kept flaking after the change was reverted. This effectively reverts r6394, relanding r6377. BUG=3496 TBR=minyue@webrtc.org Review URL: https://webrtc-codereview.appspot.com/20629004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@6404 4adac7df-926f-26a2-2b94-8c16560cd09d