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

* commit '2cf5a6f6627549842c0c840ff3615ae942a90ea3':
  Revert "Improve stack overflow diagnostics."