Patch Set 2: Looks good to me, approved; IP review completed

Bug this triggered is fixed by Ifab6bfdf3c0aa93649468f49bcf91d67f90362ca, "Do not write edge objects to the pack stream". That makes this change safe.