Revert changes to PersistenceProviderResolverHolder

This reverts commit 57decd1046d90e744c209007df0245e9e2aa1ff1.
11 files changed