Revert "defconfig: update with latest changes"