Revert "more defconfig tweaking"

This reverts commit 3f4b9263bd41449d404c7c7478a0c51946ce4cd9.