revert --e CLI arg due to refactoring