Switch to modifing the defconfig via a patch instead of directly.