am 4d3ed1a6: Merge "Revert "Fix the computation of linear ordering.""

* commit '4d3ed1a6f34bd31ed30faaca0433cf2a4b19bb7b':
  Revert "Fix the computation of linear ordering."