Removes a portion of the tenant_id filter clause

RM10527