Revert "Merge pull request #721 from kkocel/patch-1"

This reverts commit 7aac016b4680dc48f18edc769efcfa7e4715ceca, reversing
changes made to e3901310211b3701de89df699d59c15111a2f6ac.