diff --git a/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
index f794e6a..91c6b03 100644
--- a/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
+++ b/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
@@ -1,11 +1,5 @@
 RDEPENDS_${PN}-extrasdev += "obmc-pydevtools"
 
-# Add the iicmaster debug tool to p9 systems. iicmaster is for fsi-based i2c
-# engines. This is a temporary addition until proper kernel i2c driver is in
-# place. Use p9-vcs-workaround to restrict iicmaster installtion to p9 systems
-# that use openfsi
-RDEPENDS_${PN}-extrasdev += "${@mf_enabled(d, 'p9-vcs-workaround', 'iicmaster')}"
-
 # Add the deprecated /org/openbmc inventory namespace providing
 # obmc-mgr-inventory application to the inventory packagegroup
 # until all applications have been updated to use the new,
diff --git a/common/recipes-phosphor/packagegroups/packagegroup-obmc-phosphor-debugtools.bbappend b/common/recipes-phosphor/packagegroups/packagegroup-obmc-phosphor-debugtools.bbappend
index e8d656a..f4474e9 100644
--- a/common/recipes-phosphor/packagegroups/packagegroup-obmc-phosphor-debugtools.bbappend
+++ b/common/recipes-phosphor/packagegroups/packagegroup-obmc-phosphor-debugtools.bbappend
@@ -2,4 +2,5 @@
     pflash \
     gard \
     pdbg \
+    fsidbg \
     "