Revert "Fix first divergence in #1178"