Revert "defconfig updates trying to fix build isue"

This reverts commit d6210ff1611a64f545497daa6edb42127ff99a5d.