diff --git a/protobuf/Makefile b/protobuf/Makefile
index 6d2c726..ac0781b 100644
--- a/protobuf/Makefile
+++ b/protobuf/Makefile
@@ -3,7 +3,7 @@
 PROTOC=protoc \
 		--proto_path='./'
 WRAPPER_SCRIPT=../../Signal-iOS/Scripts/ProtoWrappers.py \
-		--proto-dir='./' --verbose
+		--proto-dir='./' --verbose --skip-address-helpers
 
 all: unidentified_delivery_protos
 
diff --git a/protobuf/OWSUnidentifiedDelivery.proto b/protobuf/OWSUnidentifiedDelivery.proto
index 537f8df..cf255c5 100644
--- a/protobuf/OWSUnidentifiedDelivery.proto
+++ b/protobuf/OWSUnidentifiedDelivery.proto
@@ -30,8 +30,8 @@ message ServerCertificate {
 
 message SenderCertificate {
     message Certificate {
-        // @required
-        optional string sender = 1;
+        optional string senderE164 = 1;
+        optional string senderUuid = 6;
         // @required
         optional uint32 senderDevice = 2;
         // @required