There is stil it lot of code related to the old implementation.
To make it work, we need to re-add the old iteration step. This
is only done for a transition period and will be removed again,
once the new implementation works in the same generality.