Yep, I'll rebase everything as soon as the other bug lands