drop 37_fix_legacy_persistence_handling.patch, applied upstream