Merge "Revert "Introduce RevisionStoreFactory & Tests""