Made consistent with final version of vendor.py code.

@proppy, Please check this out and merge it.