More work on bug #7948.