vendor changes
Revert "vendor changes"

This reverts commit 55a0e719313d9465be67c8f3e12de05e3fe15268.