This fixes #8435.