Update defconfig, and roll back some hTC crap, which is needed