Revert "Merge pull request #114 from tdz/bug-1054934"

This reverts commit 73bee3507d4593a96162ebdac8054a9b3ffe4fa8, reversing
changes made to 57b16fcb790bdf0b53b3c6435a37ccc8ca90ed36.