This is a half-hearted update. Lots of things still not fixed.