Revert "Merge pull request #51 from tstephen/master"

This reverts commit e55c99dd8d4be6fe8fc2178161c7dbb0435914ed, reversing
changes made to 3c4a0cd9e945fb211a7a25cb2e194285da316da9.