Revert "Merge pull request #8 from WestCoastInformatics/vha-cimi"

This reverts commit 4c3bcde47298beb3d6733fbe58fe26c8b7bc379c, reversing
changes made to 8b33fb6a08d37424ac91db75c31ba337c4c4bc49.