This fixes #8210.