Improve restoration of 1.9 backups