Revert "Merge pull request #171 from ianmjones/patch-1"

This reverts commit f5ebbd42d323171f8bf7ec79f79bad58fb058c4c, reversing
changes made to b998a5c28252357194b3283a057fe7bd84fa1542.