Revert "Merge branch 'master' of https://github.com/cjohnevans/Gannet2.0"

This reverts commit 6cfbe8805bd6a3c3921faa70045bd0cda8427212, reversing
changes made to b4dcbd21416789c7de614ea9dd82aac457b0d000.
non-interesting