This temporarily reverts commit 1e46d1aa until I find a solution to fix the libc++abi and libunwind test suites with that change.