Revert "defconfig changes"

This reverts commit a6558aa6f38be1880bbb7260a2f871f07ea0c939.