Remove CLI fallback, fix client error.

I broke stuff. :(