Revert https://reviews.llvm.org/D23279 because the tests have failed on several platforms