This fixes #8318.