Revert "Merge pull request #79 from mrngoitall/master"

This reverts commit b83fb4a4c944eea760db000249f126f543596dab, reversing
changes made to f5f4663774002731123dd2ab08ad90052adb4008.