Revert http.py and http_client.py