Use new provisioning flag to avoid exceptions