diff --git a/src/common/common_funcs.h b/src/common/common_funcs.h
index ba3081efb4..9272dbd6a6 100644
--- a/src/common/common_funcs.h
+++ b/src/common/common_funcs.h
@@ -129,19 +129,4 @@ namespace Common {
            u64(g) << 48 | u64(h) << 56;
 }
 
-// std::size() does not support zero-size C arrays. We're fixing that.
-template <class C>
-constexpr auto Size(const C& c) -> decltype(c.size()) {
-    return std::size(c);
-}
-
-template <class C>
-constexpr std::size_t Size(const C& c) {
-    if constexpr (sizeof(C) == 0) {
-        return 0;
-    } else {
-        return std::size(c);
-    }
-}
-
 } // namespace Common
diff --git a/src/core/file_sys/fs_path_utility.h b/src/core/file_sys/fs_path_utility.h
index d0060c4fc6..9b6addb64f 100644
--- a/src/core/file_sys/fs_path_utility.h
+++ b/src/core/file_sys/fs_path_utility.h
@@ -60,15 +60,15 @@ constexpr bool IsInvalidCharacterImpl(char c) {
 } // namespace impl
 
 constexpr bool IsInvalidCharacter(char c) {
-    return impl::IsInvalidCharacterImpl<InvalidCharacters, Common::Size(InvalidCharacters)>(c);
+    return impl::IsInvalidCharacterImpl<InvalidCharacters, std::size(InvalidCharacters)>(c);
 }
 constexpr bool IsInvalidCharacterForHostName(char c) {
     return impl::IsInvalidCharacterImpl<InvalidCharactersForHostName,
-                                        Common::Size(InvalidCharactersForHostName)>(c);
+        std::size(InvalidCharactersForHostName)>(c);
 }
 constexpr bool IsInvalidCharacterForMountName(char c) {
     return impl::IsInvalidCharacterImpl<InvalidCharactersForMountName,
-                                        Common::Size(InvalidCharactersForMountName)>(c);
+        std::size(InvalidCharactersForMountName)>(c);
 }
 
 } // namespace StringTraits