Use external provider_id when enumerating #9465