Don't reset current_tenant.

Changing the current_tenant is costly.  This change
saves the current_tenant for the next request to minimize current_tenant
changes.