diff --git a/icu4c/source/data/locales/fa_AF.txt b/icu4c/source/data/locales/fa_AF.txt
index c66d9f930b5..f9a48be8054 100644
--- a/icu4c/source/data/locales/fa_AF.txt
+++ b/icu4c/source/data/locales/fa_AF.txt
@@ -13,30 +13,6 @@ fa_AF {
 //    AmPmMarkers {
 //        "\u0642.\u0638.",
 //        "\u0628.\u0638.",
-//    }
-    // This is a unified sort with uz_AF, fa_AF and ps.
-    collations:alias { "ps" }
-//    collations {
-//      standard { 
-//        Version { "1.0" }
-//        Sequence { "[normalization on]"
-//           "&\u064e<<\u0650<<\u064f<<\u064b<<\u064d<<\u064c"
-//           "&\u0622<\u0627<<\u0623<<\u0672<<\u0671<<\u0625<<\u0673<\u0621"
-//           "&\u062a<\u067c<<\u0679"
-//           "&\u062c<\u0681<<\u062d\u0654"
-//           "&\u0686<\u0685"
-//           "&\u062f<\u0689<<\u0688"
-//           "&\u0631<\u0693<<\u0691"
-//           "&\u0698<\u0696"
-//           "&\u06a9<<\u06aa<<\u0643"
-//           "&\u06ab<<\u06af"
-//           "&\u06bc<<\u06bb"
-//           "&\u0648<<\u0624<<\u06c7<<\u06c9"
-//           "&\u0647<<<\u06c0<<<\u0647\u0654<<\u06d5<<\u06c1<<\u06be<<\u0629<<\u06c3"
-//           "&\u06cc<<\u0649<<\u06d2<<\u064a<<\u06d0<<\u06cd<<\u06cc\u0654<<<\u0649\u0654<<<\u0626"
-//           "&'\u00a0'<<'\u200c'<<'\u200d'"  // This is NBSP << ZWNJ << ZWJ
-//         }
-//      }
 //    }
     Countries {
         AD { "\u0627\u0646\u062f\u0648\u0631\u0627" }
@@ -179,6 +155,38 @@ fa_AF {
                 7,      // Saturday
                 1,
             }
+            monthNames{
+                format{
+                    abbreviated{
+                        "\u062c\u0646\u0648",
+                        "\u0641\u0628\u0631",
+                        "\u0645\u0627\u0631",
+                        "\u0627\u067e\u0631",
+                        "\u0645\u0640\u06cc",
+                        "\u062c\u0648\u0646",
+                        "\u062c\u0648\u0644",
+                        "\u0627\u06af\u0633",
+                        "\u0633\u067e\u062a",
+                        "\u0627\u06a9\u062a",
+                        "\u0646\u0648\u0645",
+                        "\u062f\u0633\u0645",
+                    }
+                    wide{ 
+                        "\u062c\u0646\u0648\u0631\u06cc",
+                        "\u0641\u0628\u0631\u0648\u0631\u06cc", // DoL says "\u0641\u0631\u0648\u0631\u06cc"
+                        "\u0645\u0627\u0631\u0686",
+                        "\u0627\u067e\u0631\u06cc\u0644",
+                        "\u0645\u06cc",
+                        "\u062c\u0648\u0646",
+                        "\u062c\u0648\u0644\u0627\u06cc",
+                        "\u0627\u06af\u0633\u062a",
+                        "\u0633\u067e\u062a\u0645\u0628\u0631", // MoIC says "\u0633\u067e\u062a\u0627\u0645\u0628\u0631"
+                        "\u0627\u06a9\u062a\u0648\u0628\u0631",
+                        "\u0646\u0648\u0645\u0628\u0631", // MoIC says "\u0646\u0648\u0627\u0645\u0628\u0631"
+                        "\u062f\u0633\u0645\u0628\u0631", // MoIC says "\u062f\u0633\u0627\u0645\u0628\u0631"
+                    }
+                }
+            }
         }
     }
 //    ExemplarCharacters {"[\u0621-\u0624\u0626-\u063a\u0641\u0642\u0644-\u0648\u064a-\u0652\u0654\u0670\u067c\u067e\u0681\u0685-\u0686\u0689\u0693\u0696\u0698\u069a\u06a9\u06ab\u06af\u06bc\u06cc-\u06cd\u06d0 \u200c\u200d\u200f\u200e]"}
@@ -203,34 +211,6 @@ fa_AF {
         sv  { "\u0633\u0648\u06cc\u062f\u0646\u06cc" }
         tg  { "\u062a\u0627\u062c\u06a9\u06cc" }
     }
-    MonthAbbreviations { 
-        "\u062c\u0646\u0648",
-        "\u0641\u0628\u0631",
-        "\u0645\u0627\u0631",
-        "\u0627\u067e\u0631",
-        "\u0645\u0640\u06cc",
-        "\u062c\u0648\u0646",
-        "\u062c\u0648\u0644",
-        "\u0627\u06af\u0633",
-        "\u0633\u067e\u062a",
-        "\u0627\u06a9\u062a",
-        "\u0646\u0648\u0645",
-        "\u062f\u0633\u0645",
-    }
-    MonthNames { 
-        "\u062c\u0646\u0648\u0631\u06cc",
-        "\u0641\u0628\u0631\u0648\u0631\u06cc", // DoL says "\u0641\u0631\u0648\u0631\u06cc"
-        "\u0645\u0627\u0631\u0686",
-        "\u0627\u067e\u0631\u06cc\u0644",
-        "\u0645\u06cc",
-        "\u062c\u0648\u0646",
-        "\u062c\u0648\u0644\u0627\u06cc",
-        "\u0627\u06af\u0633\u062a",
-        "\u0633\u067e\u062a\u0645\u0628\u0631", // MoIC says "\u0633\u067e\u062a\u0627\u0645\u0628\u0631"
-        "\u0627\u06a9\u062a\u0648\u0628\u0631",
-        "\u0646\u0648\u0645\u0628\u0631", // MoIC says "\u0646\u0648\u0627\u0645\u0628\u0631"
-        "\u062f\u0633\u0645\u0628\u0631", // MoIC says "\u062f\u0633\u0627\u0645\u0628\u0631"
-    }
     NumberPatterns { 
         "#,##0.###;-#,##0.###",
         "#,##0 \u00a4;-#,##0 \u00a4",