Merge "Revert "Move mark stack lock up in ordering""