Save ourselves a page request.
Fix up provider as per their latest changes. This is even more likely to break...