Back out part of revision 90a5d6e4f215. In hindsight, this
added too much complexity.