Revert "Merge pull request #2 from jamietanna/master"

This reverts commit c5909441f64e67207349c55293fe1525d5b3c671, reversing
changes made to 34701ab5d6bb38cbe9845d669aae96a502ccf3ee.