Revert "Merge pull request #76 from devoncrouse/master"

This reverts commit 2d744743aeca7deab9d81c55a26cfddb1120a8f5, reversing
changes made to 10403292aa3af456c7c7f8cd398573114db03d47.