Fix #4380: Revert optimization that breaks owners#4384

nicolasstucki merged 2 commits intoscala:masterscala/scala3:masterfrom

dotty-staging:fix-#4380dotty-staging/dotty:fix-#4380Copy head branch name to clipboard