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

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