(Issue 641) Don't create copy of a tenant yet