Add preparation for provider (bug 942361)

Sigh. I guess it's better to match the response but that's unfortunate.