Revert "(#2035) - get rid of cors proxy"

This reverts commit 9d4435de21d996a0a2271a217479af916be05519.
(#2158) - bring back custom extend