I’m restoring the two files from a backup for now. Definitely not a smooth upgrade 🙂