Revert "Merge pull request #1 from matkuscz/master"

This reverts commit b8123f1559317b22254b08f20981b523b04c1f3d, reversing
changes made to 5e64a447d91f6922d42d6373f22ac4bb7e0a7d4f.