Also apply fix for #6633 to 1.8 branch.