diff --git a/src/import/chips/p9/initfiles/p9n.mca.scom.initfile b/src/import/chips/p9/initfiles/p9n.mca.scom.initfile
index 9ef84f6081b..d0fa0f82eec 100644
--- a/src/import/chips/p9/initfiles/p9n.mca.scom.initfile
+++ b/src/import/chips/p9/initfiles/p9n.mca.scom.initfile
@@ -992,7 +992,10 @@ ispy  MC01.PORT0.ATCL.CL.CLSCOM.MCPERF2_NUM_RMW_BUF [when=S] {
 
 # All rctrl ops through tag FIFO (bit 0)
 # Serialize CMDLIST pf drop through rctrl (bit 1)
-ispy  MC01.PORT0.ATCL.CL.CLSCOM.MCPERF2_RCTRL_CONFIG [when=S && ATTR_CHIP_EC_FEATURE_HW375732] {
+# Reinstate tag fifo workaround for DD2 in response to early VBU issue
+# Leaving old code here because workaround likely temporary
+#ispy  MC01.PORT0.ATCL.CL.CLSCOM.MCPERF2_RCTRL_CONFIG [when=S && ATTR_CHIP_EC_FEATURE_HW375732] {
+ispy  MC01.PORT0.ATCL.CL.CLSCOM.MCPERF2_RCTRL_CONFIG [when=S] {
   spyv;
   0b110;
 }
diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9n_mca_scom.C b/src/import/chips/p9/procedures/hwp/initfiles/p9n_mca_scom.C
index 5baaf59256c..a958001f103 100644
--- a/src/import/chips/p9/procedures/hwp/initfiles/p9n_mca_scom.C
+++ b/src/import/chips/p9/procedures/hwp/initfiles/p9n_mca_scom.C
@@ -292,11 +292,7 @@ fapi2::ReturnCode p9n_mca_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& TGT0
 
             l_scom_buffer.insert<28, 4, 60, uint64_t>(literal_0b0100 );
             l_scom_buffer.insert<50, 5, 59, uint64_t>(literal_0b11100 );
-
-            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
-            {
-                l_scom_buffer.insert<37, 3, 61, uint64_t>(literal_0b110 );
-            }
+            l_scom_buffer.insert<37, 3, 61, uint64_t>(literal_0b110 );
 
             if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) )
             {