* proxy changes
Revert "* proxy changes"

This reverts commit bbf3eea7c0f537aa3163a9a1ed921392d9a03d2f.