Revert CLI to JarLauncher

Affects gh-212