TRQ-2587 roll back the multi-index container and use the linked list in combination with a hash map.