Partial revert of bb5e8093 (#2040) for preprod e2e bisect.
Base: v3.127.7, hotfix tag: hotfix.4.

Co-authored-by: Cursor <cursoragent@cursor.com>