Merge "Revert "Fix the computation of linear ordering.""