Revert: haida: Use new defconfig