Vectoriser performance regression in 4.7