am 6f08b865: am 2cf5a6f6: Merge "Revert "Improve stack overflow diagnostics.""

* commit '6f08b8659a3682b7e774af6ed68b1b613e147f1b':
  Revert "Improve stack overflow diagnostics."