Second commit from local, maybe vendor will work this time