Revert "Merge pull request #330 from vlastv/master"

This reverts commit b50e1b6e8720b8f4e3cd0dac7f95c0418ae951b1, reversing
changes made to 7ca852cf51bacc436485d110b92294722ef99710.