Only  workaround if we're using the old package.
Merge pull request #233 from mediatemple/22112_better_persistence

Only workaround if we're using the old package.