Remove the iterator conditional compilation code since it's now upstream