This reverts commit 28415e58. It's causing buildbot failures. (Probably just need to fix the triple for the test, but I'll look more tomorrow.)