Well, actually, I'll just cherry pick the commit :)