diff --git a/meta-phosphor/conf/distro/include/phosphor-base.inc b/meta-phosphor/conf/distro/include/phosphor-base.inc
index 7f9ec78..35bd8de 100644
--- a/meta-phosphor/conf/distro/include/phosphor-base.inc
+++ b/meta-phosphor/conf/distro/include/phosphor-base.inc
@@ -1,5 +1,4 @@
 require conf/distro/include/phosphor-defaults.inc
-require conf/distro/include/phosphor-pkg-tweaks.inc
 
 # Match the distro codename from upstream poky.
 DISTRO_CODENAME ?= "scarthgap"
diff --git a/meta-phosphor/conf/distro/include/phosphor-pkg-tweaks.inc b/meta-phosphor/conf/distro/include/phosphor-pkg-tweaks.inc
deleted file mode 100644
index a5c1df8..0000000
--- a/meta-phosphor/conf/distro/include/phosphor-pkg-tweaks.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-## Some packages do not allow a simple bbappend to tweak the PACKAGECONFIG
-## because they can end up inheriting bbclasses, which cause other
-## side-effects before the bbappend is applied.  Place tweaks for those
-## packages in this file.
-
-# Disable python from btrfs-tools
-PACKAGECONFIG:remove:pn-btrfs-tools = "python"
diff --git a/meta-phosphor/recipes-devtools/btrfs-tools/btrfs-tools_%.bbappend b/meta-phosphor/recipes-devtools/btrfs-tools/btrfs-tools_%.bbappend
new file mode 100644
index 0000000..a5ebbcc
--- /dev/null
+++ b/meta-phosphor/recipes-devtools/btrfs-tools/btrfs-tools_%.bbappend
@@ -0,0 +1,3 @@
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+
+PACKAGECONFIG:remove:class-target = "python"