Ok, I agree. I'll create a new issue after this lands. :)