Revert "Don't reset current_tenant."

This reverts commit 65c8d040c043045617d794f0e17f91512e4a88f8.