Gittrac #4102:  This ticket is abandoned, but I'm committed my partial
changes on this (never-to-be-merged) branch just so we have a record
of what I was doing.