Revert r145999. This turned out to be a bad idea. Unfortunately, 'id' is used so profusely

in many APIs and large codebases that this made the deprecated warning trigger happy to
the point of not being useful.

llvm-svn: 150223