[utils] Backup/Restore not working as expected

After the last upgrade, with many changes to the models, some of the backup/restore routines are not working properly anymore.