Revert "Update defconfigs more"

This reverts commit 3fc7911772baa44d4291843f6b3c282a8e06899e.