Add preparation for provider (bug 942361)

Also good catch. This surfaced a missed issue in reverify.