Aaand... Still broken. But less so, so it's OK.