Revert "Switch to the iterative evaluator"

This reverts commit eeb5ddcf0cffd78762b7b223354736f076b21e05.
Revert "Untested iterative implementation of evaluate"

This reverts commit f2ba9d76215f2bb22fde0f71850cdd541ee59eeb.