Recommit r102215, this time being more careful to only set the "principal

declaration" (i.e. the only which will actually be looked up) to have the
non-member-operator bit.

llvm-svn: 102231