Revert "Merge commit e24f90190c77 from llvm git (by Brad Smith):"

The BETA4 builds failed on aarch64 with errors which look
suspiciously like this commit is involved.

This reverts commit 4ae6078a60e31f7f99f2aab4adcbb14e2b841595.

Direct commit to releng/15.0.

Approved by: re (cperciva)