diff --git a/base/strings/BUILD b/base/strings/BUILD
index 65f3293..a1346bd 100644
--- a/base/strings/BUILD
+++ b/base/strings/BUILD
@@ -16,12 +16,12 @@
     hdrs = [
         "char_traits.h",
         "string16.h",
-        "string_piece.h",
         "string_piece_forward.h",
+        "string_piece.h",
         "string_util.h",
         "string_util_internal.h",
-        "utf_string_conversion_utils.h",
         "utf_string_conversions.h",
+        "utf_string_conversion_utils.h",
     ] + build_config.strings_hdrs,
     copts = build_config.default_copts,
     visibility = ["//visibility:public"],
diff --git a/copy.bara.sky b/copy.bara.sky
index 2ed782d..c50f711 100644
--- a/copy.bara.sky
+++ b/copy.bara.sky
@@ -13,22 +13,22 @@
         "AUTHORS",
         "LICENSE",
         "base/compiler_specific.h",
-        "base/containers/contains.h",
         "base/containers/checked_iterators.h",
+        "base/containers/contains.h",
         "base/containers/contiguous_iterator.h",
         "base/containers/span.h",
         "base/containers/util.h",
-        "base/i18n/uchar.h",
-        "base/functional/*.h",
-        "base/ranges/*.h",
-        "base/macros.h",
         "base/debug/leak_annotations.h",
+        "base/functional/*.h",
+        "base/i18n/uchar.h",
+        "base/macros.h",
         "base/no_destructor.h",
         "base/optional.h",
+        "base/ranges/*.h",
         "base/stl_util.h",
-        "base/template_util.h",
         "base/strings/*.cc",
         "base/strings/*.h",
+        "base/template_util.h",
         "base/third_party/icu/**",
         "build/build_config.h",
         "url/*.cc",
@@ -81,14 +81,6 @@
     core.replace("namespace base ", "namespace gurl_base "),
     core.replace("base::", "gurl_base::"),
 
-    # Ugly hack.  In Chromium, ICU is built with UChar = uint16_t.  We can't
-    # really do that with the system ICU, so we have to work this around with a
-    # cast.
-    #core.replace(
-    #    "src, src_len, output->data(),",
-    #    "(UChar*)src, src_len, (UChar*)output->data(),",
-    #),
-
     # Use system ICU.
     core.replace(
         '"third_party/icu/source/common/unicode/${file}.h"',