defconfig: fix cherry-pick derp