Followup to r52856: actually move stuff to common, not vector