Revert "hack for proxy bug"

This reverts commit b5102011005b8c58db7550cff5da5b83982d12b0.