Update OkHttp, remove workaround. Fixes #340