Merge again #21716

[hamzaremmal]

#21716 was reverted since it brakes main when running the [test_windows_full](https://github.com/scala/scala3/actions/runs/11240304545/job/31249339415#logs) job. The PR needs to address the issue and be merged back !

[Gedochao]

...so this is actually a duplicate of #18231, just with extra context. 🤡