Revert r93378, which is incorrect but currently unobservable (because the

underlying declaration of a NamedDecl happens to always have the same name
and identifier namespace as the decl itself today).

llvm-svn: 256529