Ah, misunderstood Jonas' feedback - fix this so we'll

do the right thing when both API are available.  We
want to try both of them if the first one fails.

llvm-svn: 354288