Switch to carbonzipper's protobuf definitions