Merge "Remove the workaround for old vendor blobs."