The problem with depending on the internal implementation of third party

tools is that you break when they change. This is a case in point.

llvm-svn: 16424