This reverts commit 0eed292f, there are compiler-rt build failures that appear to have been introduced by this change.