This reverts commit 61ad68a586, since there are no longer any disambiguated paths that need special handling. PR Close #42414
61ad68a586