This fixes #7751.