This fixes #8163.  They are upgraded.