More work on bug #7768.