This fixes #8267.