Revert "Merge pull request #305 from nadoshmado/gh-272"

This reverts commit a4b0090d300a7fbf600abda3d1d9f2d55f621666, reversing
changes made to 5d5281af183187185621232a763bc73364af9898.