Reverted back the change to the way we iterate the source files to hunt down performance bottleneck.