Jonathan Nobels

The secret sauce here is kSecAttrAccessibleAfterFirstUnlockThisDeviceOnly when saving keys which prevents them from being included in iCloud backups. We may need to write some code to migrate all existing entries...

The "simple" fix for this, is to prevent our keychain entries from getting restored to a different device. This fixes the problems of duplicate nodes, but is arguably slightly user-hostile...

Thank you @333fred !