Revert "Merge pull request #26 from pdpiech/master"

This reverts commit 5edd2cbdc732068d5ace25f4a277ef8581df38cb, reversing
changes made to 57f008f41a461c6340ed6c8f6e5bcb52c9c80e1f.