We should change the stage to use TenantCollectionClonerQueryStage so it can handle collection drops.