This make Merge Optimzer take 21s instead of 35s in one case.

I think this work correctly in case of revert.