Revert "Merge branch 'ebelter-cghub'"

Reverts PR #208

This reverts commit 9113e05061af5b5ef5dd70662c84ea50c18940c1, reversing
changes made to 85e0addf75bf6d49996815a7f9b4a41a08faa82f.