Revert "defconfig"

This reverts commit ae1dbd1cebecc887490ba9186d28b21cae5b529f.

Change-Id: Id9f7ccf030020589c19602c0882add6e3343ff15