Revert "Switch to new vendor repo layout."

This reverts commit a68d19cf1d4265356beee629080705e3288075df.