diff --git a/meta-ibm/conf/machine/mihawk.conf b/meta-ibm/conf/machine/mihawk.conf
index a296e79..e5485c3 100644
--- a/meta-ibm/conf/machine/mihawk.conf
+++ b/meta-ibm/conf/machine/mihawk.conf
@@ -6,7 +6,6 @@
 
 OBMC_POWER_SUPPLY_INSTANCES = "0 1"
 
-PREFERRED_PROVIDER_virtual/p9-vcs-workaround = ''
 PREFERRED_PROVIDER_virtual/openpower-fru-vpd-layout = "mihawk-openpower-fru-vpd-layout-native"
 
 require conf/machine/include/ast2500.inc
diff --git a/meta-ibm/conf/machine/witherspoon.conf b/meta-ibm/conf/machine/witherspoon.conf
index 20f5159..340d7f7 100644
--- a/meta-ibm/conf/machine/witherspoon.conf
+++ b/meta-ibm/conf/machine/witherspoon.conf
@@ -6,8 +6,6 @@
 
 OBMC_POWER_SUPPLY_INSTANCES = "0 1"
 
-PREFERRED_PROVIDER_virtual/p9-vcs-workaround = ''
-
 # A machine override for common machine configuration for all of IBM's
 # "Accelerated Computing" class of systems.
 MACHINEOVERRIDES =. "ibm-ac-server:"
diff --git a/meta-ibm/meta-romulus/conf/machine/romulus.conf b/meta-ibm/meta-romulus/conf/machine/romulus.conf
index 87ac995..1d73ba4 100644
--- a/meta-ibm/meta-romulus/conf/machine/romulus.conf
+++ b/meta-ibm/meta-romulus/conf/machine/romulus.conf
@@ -2,8 +2,6 @@
 KERNEL_DEVICETREE = "${KMACHINE}-bmc-opp-${MACHINE}.dtb"
 UBOOT_MACHINE = "ast_g5_ncsi_config"
 
-PREFERRED_PROVIDER_virtual/p9-vcs-workaround = ''
-
 require conf/machine/include/ast2500.inc
 require conf/machine/include/obmc-bsp-common.inc
 require conf/machine/include/openpower.inc
diff --git a/meta-ibm/meta-romulus/recipes-phosphor/host/p9-host-start.bbappend b/meta-ibm/meta-romulus/recipes-phosphor/host/p9-host-start.bbappend
index 278470f..bc7e02e 100644
--- a/meta-ibm/meta-romulus/recipes-phosphor/host/p9-host-start.bbappend
+++ b/meta-ibm/meta-romulus/recipes-phosphor/host/p9-host-start.bbappend
@@ -1,3 +1,2 @@
 RDEPENDS_${PN}_append_romulus = " avsbus-control"
 RDEPENDS_${PN}_append_romulus = " vrm-control"
-RDEPENDS_${PN}_remove_romulus = "p9-vcs-workaround"
diff --git a/meta-ibm/recipes-phosphor/host/p9-host-start.bbappend b/meta-ibm/recipes-phosphor/host/p9-host-start.bbappend
index 423a9e4..9ceffea 100644
--- a/meta-ibm/recipes-phosphor/host/p9-host-start.bbappend
+++ b/meta-ibm/recipes-phosphor/host/p9-host-start.bbappend
@@ -1,9 +1,5 @@
 RDEPENDS_${PN}_append_ibm-ac-server = " avsbus-control"
 RDEPENDS_${PN}_append_witherspoon = " vrm-control"
 RDEPENDS_${PN}_append_ibm-ac-server = " power-workarounds"
-RDEPENDS_${PN}_remove_ibm-ac-server = "p9-vcs-workaround"
 RDEPENDS_${PN}_append_mihawk = " avsbus-control"
 RDEPENDS_${PN}_append_mihawk = " vrm-control"
-RDEPENDS_${PN}_remove_mihawk = "p9-vcs-workaround"
-RDEPENDS_${PN}_remove_rainier = "p9-vcs-workaround"
-