This reverts commit fd18547e. Need to add a check for the size of the vectorization tree to avoid some extra vectorization.