As per comment about leaving code the same for when `--collection=false`