Revert r342148 (and follow-on fix attempts r342154, r342180, r342182, r342193)

Many bots buildling with make have been broken for several days, e.g.
http://lab.llvm.org:8011/builders/lld-x86_64-darwin13

llvm-svn: 342336