Fixed restore code to handle old backup files in 2.5