Merge "Revert "Clean-up state if we have an exception when acquiring provider""