Revert "Merge pull request #3 from bmulvihill/refactor-iteration"

This reverts commit 7da97d54f4afc5aefa6ab82ccedd1df1cff96686, reversing
changes made to 0fa5cf6cb39b6e509bfb81747979561174338ba6.