This reverts r341987 since it will cause trouble when there's a module ID collision. llvm-svn: 341995