am 1c1bdcdd: Merge "Revert "Revert "Fix the computation of linear ordering."""

* commit '1c1bdcdd472500cb9e181b3ba9988533a98125fd':
  Revert "Revert "Fix the computation of linear ordering.""