Revert previous change and fix -Wrange-loop-analysis complains
2 files changed