Bug 874389 - Recovering the provider
Merge pull request #9904 from lodr/bug-874389-recovering-provider

Bug 874389 - Recovering the provider