defconfig: Revert some of recent changes

Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>