Fix for #8855.