More work on bug #7950.