Revert "Check for providers being enabled"

This reverts commit 3bc2536d.

Reason for revert: It looks like just checking for the provider is enough as they don't resolve if not enabled.

Change-Id: If8f1c3ea5bd3e6c8db63ce6f39449594b771b069