We now conditionally turn on whole_file in do_cmd() right before