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

This reverts commit bca472b06d92c0f4f9c9df8db7b7590592c34087, reversing
changes made to 19ab256807a9f0ba47aab8eb69c01399099fe191.