Revert "Various defconfig optimizations"

This reverts commit 13881ad9f20642d7681eaee42fdb129b0c93e246.