Revert "Merge pull request #253 from corrupt952/master"

This reverts commit 6d3ed6d96c4a3ac85b97d81bad95b7254b2aa2d4, reversing
changes made to a35fede61ac1a2fcff519ad052f2fcb8808922b9.