Revert "Fix initialization problems if SingletonProvider is already initialized."

This reverts commit 10abc09ba75dd26d2e5b428210a9df6f65e0ac8f.