Still fighting CLI builds. Works with plain CLI now