rerolling patches off the exact version that worked.  Will make the patches nice later.