Work towards bug #7809.  This is the base file.