Reverted to straight http client