Revert "Merge pull request #17 from jpillora/master"

This reverts commit 071d1f21b85377e860d7245a37b241a814e7c658, reversing
changes made to 868e78e3d492fc8e6f4c5e0e7c2795fbd257f4f0.