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

...y"

This reverts commit d88b5cf20880f0b2320352f5353c99d1f17a6225, reversing
changes made to 6e65ba3751f71562254353bf91b10d92452ec7f8.