Revert "cherry-picking eaa21d6b2c26f26864ba72ce0bd39d9848385047 from the cmd2"

This reverts commit 28595804a2f45cc798819e605ac3813a2e2804f0.

sigh