Changing logic for httpproxy
Reverting changes for proxy