Revert "Merge pull request #451 from ashtaroth/master"

This reverts commit 5d46a5f91e7d6b34f9351de99510bb39367a99be, reversing
changes made to df2137852460553bde58b9d1be0d98f83115e757.