Revert "Defconfig update"

This reverts commit a1ea7116ccf43c74f1c17867723a6df05493638b.

Change-Id: I0ec5325476359291cce8158f988ed095a50a15cf