Revert "Merge remote-tracking branch 'origin' into feature-cgkineo-cli"

This reverts commit b66bb86b0222910832d73739f5f86203021fc148, reversing
changes made to 9d6c9e68196b4e32b1d5c456a2ded57ce4e5a943.

Mistaken merge