Remove iterator hack.