Merge "Revert "Improve stack overflow diagnostics.""