This will cause some merge conflicts, but the changes in closure-size will be overwritten by the upgrade in master otherwise.