Revert "Merge pull request #22 from mrowlinson/patch-1"

This reverts bc909782dd763a4ad238021362fc2e338d6795c, reversing
changes made to 299315866d035906109fde1077fb30c339b63648.