Transition to universal provider safely

This allows us to hot switch back to the
old one if necessary.

See bug 936680, bug 936118