found other places where revert broke persistence
Merge pull request #643 from shatterednirvana/persistence-unreverts

found other places where revert broke persistence
Merge remote-tracking branch 'org/testing' into store-apps-in-opt