Revert "Fix cli/terminal build"

This reverts commit d53faa7ff00ebc33ebeed530647f86ba89f05bbc.