Revert "Merge pull request #276 from shatterednirvana/persistence-finall...

...y"

This reverts commit 98b2a49d664a06d1168ee6acbea980374c733d76, reversing
changes made to c55220742492e62db372c662468abaabf22796c0.