Final touches to get Chef 11 restore working.