Revert "Merge pull request #1 from Robinlovelace/patch-1"

This reverts commit 79f7fa75a51c79599e788594d422cf341177f755, reversing
changes made to ded597e6776944619a03717ab186fc0236923b6c.