Quick fix simply commenting out all the vehicle-related compile errors related to the merge from Main in #57891. Next month when there's more time I'll subtract this and clean up the tangle it's got into properly.