defconfig: fix some git revert BS