Fixes 7104 - make sure the service_wait will be used as the default provider