revert batch mode, for now