Revert "Removed proxy"

This reverts commit 77b8f2bf257a0e9fac8d78ec2bbc0e0e9b8c7599.