1. And rebuild generated protobuf.
2. Making sure to keep the link/data ordering (we have a test for this and it
still passes)