am 85d97eae: Merge "Revert "Move mark stack lock up in ordering""

* commit '85d97eaedba4b60ae4184883bce05d3a5d2604f5':
  Revert "Move mark stack lock up in ordering"