Revert "Scaling issues and semantics relating to who provides proxy info"

This reverts commit 5c888659ba138c45572b10b4d9b3ac32d150d232.
Revert "Revert "Scaling issues and semantics relating to who provides proxy info""

This reverts commit 4ad47fe1d6677cac7711eab9a049bc3348760803.
Revert 8a1517b..c933913

This rolls back to commit 8a1517bd5f9e46853dbe64b34cb928a405f21dde.