Revert "Switch defconfigs"

This reverts commit 05fb4944e8f8e8720aed682d58598dd1663122d2.