This fixes #7852.