This reverts commit 502a67dd7f23901834e05071ab253889f671b5d9. This expose a failure in test-suite build on PowerPC, revert to unblock buildbot first, Dave will re-commit in https://reviews.llvm.org/D96287. Thanks Dave.