Revert "Merge pull request #3 from Grundik/master"

This reverts commit 838e76dee1b29b2fe7965c55728538fedc5bcaa7, reversing
changes made to ebd79bd0b36ec82f320588fc5df05e63941540cb.