Revert "CLI: fixed TODO"

This reverts commit 410ed90458dd3e6f2cb0aa1865784d6ec57be9f2.