Add preparation for provider (bug 942361)

Nice.