Fix up provider... probably temporarily.