This fixes #7439.