Revert "Fix typo"

This reverts commit 32ceb00b689dfb78c2304167d169af3b7758fd78.
Revert "Handle mixed qualified and unqualified symbols"

This reverts commit 2a35513043c65879d103b3614bab003b4bfd957f.