Bump lib major due to struct change. Backport a fix to fix an error introduced when backporting a fix.