Revert "defconfig: Updates"

This reverts commit 4685c911268a8e2c34a1ccfaf4ca61c05f2e109e.