Get rid of ordereddict fallback