Revert "Reland r356547 after fixing the tests for Linux."

This reverts commit 538fb722 (r356565).

This is still breaking a build bot:
http://lab.llvm.org:8011/builders/llvm-clang-lld-x86_64-scei-ps4-ubuntu-fast/builds/45557

llvm-svn: 356630