Revert "One (base) proxy implementation for all!"

This reverts commit a7c05fed27375feed08bfd570c109f9559f05f07.