This reverts commit dd042125.
This cause call to python2.7 unsupported ordereddict