perf: don't always return basis-vector array

perf: don't always return basis-vector array #3647