This reverts commit 7bff85c2bc741102b41b259752269f9ecd398d68. It was partially reverted in https://codereview.webrtc.org/1354163002. This reverts the rest. BUG=webrtc:4960, webrtc:5016 TBR=andrew@webrtc.org Review URL: https://codereview.webrtc.org/1343263004 . Cr-Commit-Position: refs/heads/master@{#10003}