Revert "defconfig: cleanup 1"

This reverts commit 31ac0fb07731dcb3db27699bab14f9bfde61e9b7.