Work on bug #7936.