Revert "Merge branch 'master' of https://github.com/CCI/cci"

This reverts commit 36b009e556bc12d36db4298368a0df69f7dff3f1, reversing
changes made to 67a11b0be293a054220e680bcb885376e583f991.