This reverts commit e767655ede. In addition, it applies required changes to function with the new CLI backend.
e767655ede