Revert "Merge pull request #264 from reidmorrison/master"

This reverts commit e238b4a757d64d980e3137c5b57a37a1729733a9, reversing
changes made to 821bb49b671247be050f04a6af26754f75ba85ea.