I was wrong. Still broken, but getting there