This fixes #7722.