Revert "Merge pull request #289 from talktokets/master"

This reverts commit 1a668cf53f5e01cc28d1f010c51e742907fde427, reversing
changes made to 27033dc444344cc540c42c3368a277b5946ab582.