Remove OrderedDict compat - we're installing it from pip if necessary