Replace custom ardent fork with iterator hack