This re-implements the reverted commit 8b051d6cc3c7c3bcda16702f30dc0fabe7b9f881. Closes #ISSUE Release Notes: - N/A --------- Co-authored-by: Ben Kunkle <ben@zed.dev>