(PR filed as #8978, just to tie off that task.)