Re-adding features that were removed and upgrading papyrus versions.