SI-8460 Fix regression in implicit divergence recovery

Minor rework of #3667.

Review by @retronym.