Revert "Merge pull request #72 from malkusch/master"

This reverts commit 5d8f4ba150bd42dd4a600b4a4c87c1800545d57f, reversing
changes made to 470ae04ab677c56162740a10b729313d8ff42379.