Revert "WIP: multi-tenancy"

This reverts commit 37d57c16391d769b8844d964c8533588267a4591.