Part of #116901. The code was already structured to not use the extractor iterators, so I only changed the entry point.