bring in our defconfig changes