Backported fixes

• Revert "Include top-level symbols from same file in outer ambiguity error" #17438

Contributors

Thank you to all the contributors who made this release possible 🎉

According to git shortlog -sn --no-merges 3.3.1-RC3..3.3.1-RC4 these are:

     2 Paweł Marks
     1 Nicolas Stucki