0001-Revert-alecthomas-kingpin-import-path.patch
0002-Relax-brittle-TestProtoFormatUnchanged-test.patch
