It seems like nothing changed functionally here so since it's already a big CL, would you mind cleaning this up in followup work?