Revert "Merge pull request #79 from Shade-/patch-2"

This reverts commit 390aa3a4533700bba0de0b5389ce5ca95b5cedff, reversing
changes made to 96ec2a158c1e791f6eb77e1d926c4c3c34a73235.