Revert #7930

This reverts #7930 for #10138 .

We don't need `this.finalized` anymore, right?