This fixes #7748.