I'm having old variants in my head. I'll change it tomorrow, but if we need a release out tomorrow, I'd need a  preliminary LGTM on this and @jmikola 's point.