Revert "cmd line changes"

This reverts commit a30e9ae9a39ea612b6c41d638796867f92901b07.