This was re-added by 63471cd (and modified by me to use iterator again), it simply needs to be removed. Fixes #15395