Ahhhh roll back that commit, I didn't see that Lawrence had filed

a separate phabracator with the revised change.  This was his
first atttempt which broke on the bots the second time too.

llvm-svn: 317181