This reverts commit 7e90ee2690. I am about to revert some recent CLI changes, so this is again required.
7e90ee2690