Until all the data is updated to always be "all", we have to handle the case of provider_restriction being set to None or "all" (which mean the same thing). The code can be tidied up once the broadcast provider_restriction is never None.