Revert "Merge branch 'mkjdc' of github.com:MarkKJones/hcana into develop"

This reverts commit 9baaece54dfb4bbf06d7b00c57ea70d946ee5eb5, reversing
changes made to de22a1340f1c8084b991f015f1b3fc0b03f8de73.