Revert back to explicit proxy handling