Revert "Merge pull request #749 from Bonuspunkt/master"

This reverts commit 815dae1f1ee8bc57d0400e98d0e2f08e63e5ad9c, reversing
changes made to 0f116f6e612c042ac1504042fb9850fae2dc3c02.
Fix CLI tests broken in bc538da87145da75497fcdc3678795f72e401612.