Revert "Merge pull request #26 from andrew-jones/master"

This reverts commit c1aa6ee4637349d4342537e6c854c5210e59923f, reversing
changes made to 2c10f066ccda0b626e7ee3d9f08c45c05aad215f.