Uh, I broke something and here's a patch