Add preparation for provider (bug 942361)

Hmm, that's a good question - that's in the existing provider code this is based on.