Restore build with the new layout.