Put back explicit inmports that had been replaced by editor