Revert "Merge pull request #74 from varya/master"

This reverts commit bcf219635001fdce3cc26a78cdd16c03a8b84883, reversing
changes made to 2cd6203774aef20f0c0dc4190fcc9e9831013453.