5a3599df8a
This reverts commit e3b39a677b535bc2676a939519906f6b2dbce6f4. I misunderstood and thought this was ready to go in the tree, but it was on a remote branch only for a review.