Revert "Merge pull request #15 from bentian/bug-951565"

This reverts commit 59877c64bb3665441547f9e7a9a990394393bffc, reversing
changes made to db81125fc71fdd583480ad68195df5dbf6156a1f.