Revert "Updating defconfigs to match new patchs"

This reverts commit e7f8f2a034673754228adf0bef5453000990bde6.