Revert "Merge pull request #186 from gerfuls/master"

This reverts commit d030cd99cfff57310904c5d03b709281267cf9ef, reversing
changes made to a1d5561eac244147b4387afdef549caa1514fe10.