I started fresh in a newly cloned repo, with that patch, and that seems to work now