Reimplemented in a better and reusable way
Add upgrade step for reverting tiles already migrated to PersistentMapping in 1.0a10. fixes gh-467