Revert "Merge pull request #222 from rhayes-cida/master"

This reverts commit 6fe623878b9015f959b5372b3cbfe0fe0f34ba5b, reversing
changes made to 2e0b53eb681f4f571fc2d01764a0d1865cf5b72e.