- #54632 unintentionally reverted changes introduced in #54681, likely
due to a merge conflict resolution issue.

See the original PR for the changes.

Release Notes:

- N/A

Co-authored-by: Danilo Leal <danilo@zed.dev>