Initial changes to reuse the UNGROUPED_KEY.