temporally restored former __save_elaboration