Add the proxy handler back