Revert "Merge pull request #193 from archgrove/master"

This reverts commit 609144a871f77fb0f66a2451c7cace01144de169, reversing
changes made to 57629d214808f51f30d06f957caca7fe9ef74653.