Fix for #8958.