Drop the need for the special boot_file