Undo ifmap change

Change-Id: I8397a8f1423933f6d659381fa5374d003219bb6f