Revert 563f9d694d612714e985ccfe046f3b2b3ef47247
Updated vendor lengths.