This reverts commit 2aecb6f02b, reversing changes made to 5d34599390. The change broke OkHttp's tests
2aecb6f02b
5d34599390