Revert "Merge pull request #258 from JoesCat/master"

This reverts commit 68c4193a27139f4430d18dc8f3d669bee0654975, reversing
changes made to 38fb4c48ecca2c7ed0e6ee8b5f5cca8568989ff0.