(And for posterity, this isn't blocking the merge; Yedi's making a ticket for cleaning this up, and we'll currently deploy as is.)