Vendorize the pieces of six we need