Move handling of 'unknown' providers.

Needed with D292.