Revert "Merge pull request #493 from Sleaker/master"

This reverts commit 7b3c05eb8e9b820ef70adf0bd3af145436d2af48, reversing
changes made to d065e48b4a98de79e41f174243d48ae49cef616e.