Revert "now bring in our defconfig changes"

This reverts commit 6673d47bb147e31e9fbecaed3d8f217af1f7c4c5.
Revert "blow out full defconfig"

This reverts commit d2c773391ce6fe9f33ba7b529cc64650b5391285.