Revert "Merge pull request #16 from timkalinowski/master"

This reverts commit ec82a2cbbd1aa8cbf67a6b1b285bb732edbabfb8, reversing
changes made to 9f5b3bbb43e6fae9c443c16f3df7fca66f91759d.