Revert r188498.

This change broke release+asserts build with compiler-rt.