Revert "Merge pull request #121 from JasonGiedymin/master"

This reverts commit d3819e3209e32d2e88ec481d5a9cd11444b81c3f, reversing
changes made to ea4210b2067dddb35d7ff9119ed43323b2117910.