Revert CLI option fix