This reverts commit 09feb0f3d9. (In order to make WebRTC happy this also needs to be reverted.)
09feb0f3d9