Revert "Merge pull request #1 from emallson/master"

This reverts commit 17bd4e58e575687837adfec477be422889a718ab, reversing
changes made to 1e3842a0ac48306e07e7f24d1f5b57cbef93b2b5.