Revert "CLI: remove command opts/args in "gnt-X""