Revert "Move to Vendor"

This reverts commit 95c945fe6fca5b2dc619be25a26456c8f3db8998.
Janice changes