This fixes #8273.