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

This reverts commit 9bc8d2f3054f75c618d820cc24659edcf218b366, reversing
changes made to 682e556367e0049bb3ae127cec6e6c459abca1b0.