Fix for #8494.