Revert "Merge pull request #116 from idearat/master"

This reverts commit 65b658d1e47f380e4a50a859a871c8c48d1bd775, reversing
changes made to e88679a4a9146017cc9821efa4645acc7ef428c4.