Revert "[BUG #7667] introduce DefaultOrderedDict and OrderedDict to preserve the insertion order"

This reverts commit d7e2445c54871ff8e765e1db5ae79be4d1f98da6.