Revert "Merge pull request #157 from silentrob/master"

This reverts commit 752b6217ea3dcacb89e58130e9c40069d2b89306, reversing
changes made to d795f841a1c622cdf445fe24bc9a391c6141a9c6.