Revert r227242 - Merge vector stores into wider vector stores (PR21711).