Revert "Tentative fix for invalid iterator range regression"
Revert "Tentative fix for invalid iterator range regression"

This reverts commit 23151ab53574e0e893f4507313ff15388638746a.

Fixed root cause in previous commit.

JurassicWordExcel/core,JurassicWordExcel/core,JurassicWordExcel/core,JurassicWordExcel/core,JurassicWordExcel/core,JurassicWordExcel/core,JurassicWordExcel/core,JurassicWordExcel/core,JurassicWordExcel/core,JurassicWordExcel/core