Revert "Merge pull request #51 from shrug/master"

This reverts commit 9982742183a710910f348281d7f2058f3c2468f9, reversing
changes made to 8e9c0d4e66c11201f71568502286be0049760da8.