diff --git a/scss/_utilities.scss b/scss/_utilities.scss
index 19a1d1a07..648c94c60 100644
--- a/scss/_utilities.scss
+++ b/scss/_utilities.scss
@@ -107,13 +107,13 @@
 
 @include text-emphasis-variant('.text-primary', $brand-primary);
 
-@include text-emphasis-variant('.text-success', $state-success-text);
+@include text-emphasis-variant('.text-success', $brand-success);
 
-@include text-emphasis-variant('.text-info', $state-info-text);
+@include text-emphasis-variant('.text-info', $brand-info);
 
-@include text-emphasis-variant('.text-warning', $state-warning-text);
+@include text-emphasis-variant('.text-warning', $brand-warning);
 
-@include text-emphasis-variant('.text-danger', $state-danger-text);
+@include text-emphasis-variant('.text-danger', $brand-danger);
 
 
 // Contextual backgrounds
@@ -127,18 +127,12 @@
   background-color: $gray-dark;
 }
 
-.bg-primary {
-  // Given the contrast here, this is the only class to have its color inverted
-  // automatically.
-  color: #fff;
-}
-
 @include bg-variant('.bg-primary', $brand-primary);
 
-@include bg-variant('.bg-success', $state-success-bg);
+@include bg-variant('.bg-success', $brand-success);
 
-@include bg-variant('.bg-info', $state-info-bg);
+@include bg-variant('.bg-info', $brand-info);
 
-@include bg-variant('.bg-warning', $state-warning-bg);
+@include bg-variant('.bg-warning', $brand-warning);
 
-@include bg-variant('.bg-danger', $state-danger-bg);
+@include bg-variant('.bg-danger', $brand-danger);
diff --git a/scss/mixins/_background-variant.scss b/scss/mixins/_background-variant.scss
index 3287d7a06..a665f2551 100644
--- a/scss/mixins/_background-variant.scss
+++ b/scss/mixins/_background-variant.scss
@@ -3,6 +3,7 @@
 // [converter] $parent hack
 @mixin bg-variant($parent, $color) {
   #{$parent} {
+    color: #fff;
     background-color: $color;
   }
   a#{$parent} {