diff --git a/src/corePlugins.js b/src/corePlugins.js
index b575fdcabb77..b5e34c32c73e 100644
--- a/src/corePlugins.js
+++ b/src/corePlugins.js
@@ -1179,13 +1179,7 @@ export let corePlugins = {
     })
   },
 
-  borderColor: ({ addDefaults, matchUtilities, theme, corePlugins }) => {
-    let value = theme('borderColor.DEFAULT', 'currentColor')
-
-    addDefaults('border-width', {
-      'border-color': toColorValue(value),
-    })
-
+  borderColor: ({ matchUtilities, theme, corePlugins }) => {
     matchUtilities(
       {
         border: (value) => {
diff --git a/src/css/preflight.css b/src/css/preflight.css
index e39110866301..c15a3f2da831 100644
--- a/src/css/preflight.css
+++ b/src/css/preflight.css
@@ -9,7 +9,7 @@
   box-sizing: border-box; /* 1 */
   border-width: 0; /* 2 */
   border-style: solid; /* 2 */
-  border-color: currentColor; /* 2 */
+  border-color: theme('borderColor.DEFAULT', 'currentColor'); /* 2 */
 }
 
 ::before,