Revert "Merge pull request #12 from nmcglohon/Neil3"

This reverts commit 1ce706ffca30042a414876d13c88231158b7f26c, reversing
changes made to 5405b786c15b39048c8a7ae6b031aa618ebe1106.