Revert "Use correct configtest, don't override provider"

This reverts commit 6c4bf7747685d2949c248746735c395897ead0f1.