restore patches from revert, this is lame, you need to bootstrap to fix it.  625^H^H^H0 days without having to rebootstrap