Revert "Merge pull request #2 from d1ngell/master"

This reverts commit be24fb37831549adb45227270686b9a8328ef924, reversing
changes made to 6e4e686bd769af564c3ce234b57e515f2debea94.