Restore itervalues call to iteritems; key necessary for correct behavior