This should not have been reverted--my mistake from working with older code, fixing (I think) a minor issue that no longer exists given the changes in 3941, and then merging late last night. I will get this back in and make sure it works with my iterative implementation.