This fixes #7750.