Re-reverts https://github.com/zed-industries/zed/commit/d84a81e5e38e7d1eadf78e2bcf7a1f32eae034d4 with fixes Release Notes: - N/A
Re-reverts https://github.com/zed-industries/zed/commit/d84a81e5e38e7d1eadf78e2bcf7a1f32eae034d4 with fixes Release Notes: - N/A