diff --git a/lightningd/peer_htlcs.c b/lightningd/peer_htlcs.c
index f59d32154..7933192b9 100644
--- a/lightningd/peer_htlcs.c
+++ b/lightningd/peer_htlcs.c
@@ -810,8 +810,6 @@ static u8 *convert_failcode(const tal_t *ctx,
 		return towire_permanent_node_failure(ctx);
 	case WIRE_REQUIRED_NODE_FEATURE_MISSING:
 		return towire_required_node_feature_missing(ctx);
-	case WIRE_CHANNEL_DISABLED:
-		return towire_channel_disabled(ctx);
 	case WIRE_PERMANENT_CHANNEL_FAILURE:
 		return towire_permanent_channel_failure(ctx);
 	case WIRE_REQUIRED_CHANNEL_FEATURE_MISSING:
diff --git a/wallet/test/run-wallet.c b/wallet/test/run-wallet.c
index 27f4b148d..eee265e4f 100644
--- a/wallet/test/run-wallet.c
+++ b/wallet/test/run-wallet.c
@@ -711,9 +711,6 @@ void topology_add_sync_waiter_(const tal_t *ctx UNNEEDED,
 					  void *arg) UNNEEDED,
 			       void *arg UNNEEDED)
 { fprintf(stderr, "topology_add_sync_waiter_ called!\n"); abort(); }
-/* Generated stub for towire_channel_disabled */
-u8 *towire_channel_disabled(const tal_t *ctx UNNEEDED)
-{ fprintf(stderr, "towire_channel_disabled called!\n"); abort(); }
 /* Generated stub for towire_channeld_config_channel */
 u8 *towire_channeld_config_channel(const tal_t *ctx UNNEEDED, u32 *feerate_base UNNEEDED, u32 *feerate_ppm UNNEEDED, struct amount_msat *htlc_minimum UNNEEDED, struct amount_msat *htlc_maximum UNNEEDED)
 { fprintf(stderr, "towire_channeld_config_channel called!\n"); abort(); }
diff --git a/wire/extracted_peer_01_remote_addr.patch b/wire/extracted_peer_01_remote_addr.patch
new file mode 100644
index 000000000..5e9aeb463
--- /dev/null
+++ b/wire/extracted_peer_01_remote_addr.patch
@@ -0,0 +1,13 @@
+diff --git a/wire/peer_wire.csv b/wire/peer_wire.csv
+index a028ddc66..4043c6350 100644
+--- a/wire/peer_wire.csv
++++ b/wire/peer_wire.csv
+@@ -6,6 +6,8 @@ msgdata,init,features,byte,flen
+ msgdata,init,tlvs,init_tlvs,
+ tlvtype,init_tlvs,networks,1
+ tlvdata,init_tlvs,networks,chains,chain_hash,...
++tlvtype,init_tlvs,remote_addr,3
++tlvdata,init_tlvs,remote_addr,remote_addr,wireaddr,
+ msgtype,error,17
+ msgdata,error,channel_id,channel_id,
+ msgdata,error,len,u16,
diff --git a/wire/onion_wire.csv b/wire/onion_wire.csv
index 2ac0c4cff..28c58724d 100644
--- a/wire/onion_wire.csv
+++ b/wire/onion_wire.csv
@@ -97,6 +97,9 @@ msgdata,final_incorrect_cltv_expiry,cltv_expiry,u32,
 msgtype,final_incorrect_htlc_amount,19
 msgdata,final_incorrect_htlc_amount,incoming_htlc_amt,u64,
 msgtype,channel_disabled,UPDATE|20
+msgdata,channel_disabled,flags,u16,
+msgdata,channel_disabled,len,u16,
+msgdata,channel_disabled,channel_update,byte,len
 msgtype,expiry_too_far,21
 msgtype,invalid_onion_payload,PERM|22
 msgdata,invalid_onion_payload,type,bigsize,