Revert "Merge pull request #1904 from andymckay/987664"

This reverts commit 65e1829a75c9c635206f79b3e88038ce66fa46da, reversing
changes made to 26123fc486ac0fb30d7fb8cf29e96c4ab4ee438c.