This fixes #7550.