I think we should rejoice that this big hassle is behind us now.
It was the root cause of the two failed forks, and it was an absolutely prerequisite to entirely squash it before going forward to leave this ordeal behind us.