Revert "Merge pull request #1603 from rwjblue/deprecate--proxy"

This reverts commit edcff6dcf339ff2eeaa5c40b94272472c947b054, reversing
changes made to cda477f8a6fd4a2d6c904681e23b4a0d7a388316.

Per comment in #1681