Revert "Merge pull request #1049 from jgunderson/21859-1"

This reverts commit a0373ec5312138e08c5fcd2c9ef81a819eac1d63, reversing
changes made to fd7d36f8c8c235a1ab97efcbf81b7d09f53639d0.