Revert faulty "Merge pull request #17 from JohnFLewis/patch-7"

This reverts commit e57464a12c20d5554ac014479a2e6869ac1366ba, reversing
changes made to 294627854afea86a0b51f3e77bbccaae5bd7c86c.