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

This reverts commit aa21ac43d95c16f46bba603d839e34e5d15379b8, reversing
changes made to a5231d04b298798dfbe8ef7e29468d0c38185734.