Revert "Merge pull request #40 from riconeitzel/patch-1"

This reverts commit 13e370cf16d11ada2d7c44ad2d8ccf062ba36de7, reversing
changes made to df23a47e0edb27d22761b247db1b578201bf1322.