Revert "Merge pull request #425 from thefinn93/master"

This reverts commit 84866ca679c037447215720d2e1764204369aaab, reversing
changes made to d58231ff516aa00616331885cdaa16ebf516d146.