Revert the early exit from the update loop, as it causes many test
failures.