Incidentally to other maintainers: I'd probably favour the older version until we can have one that doesn't require such a huge patch.