Actually, this should not be removed.  This is still true, even if you're not multi-tenant.