We should see if there's a way to fix it. One thought is that if IAO itself imports OMO in its entirety, and OMRSE imports IAO in its entirety, then there's no rationale for a separate OMO import and we might consider removing it. However, if those conditions do not hold, then we would need to consider a wider range of options.