Bug 865407 - Follow-up to fix other places expecting the old IID.
CLOSED TREE