You're right. I think we can :shipit: as-is and fix it later.