Revert "Merge pull request #645 from markcarver/patch-1"

This reverts commit 724263b3332eca7ba2e06d199674aaca5fb41fce, reversing
changes made to 037ce3d560f0302c0fc42db314c082ea2bf368ba.