Revert "Merge pull request #69 from emartynov/master"

This reverts commit ecc417140afab8c610be3d4f7e60534817f018f7, reversing
changes made to 052f5885f7da9ddf5c39befc95e35c623d6d5358.