This reverts commit b52355f8a196b5040dc2e42870bf8c459306cfaa. The change this patch depends on (5a1958f2673f8c771e406a7e309e160b432c9a79) broke the UBSan buildbots. See https://reviews.llvm.org/D75057 for more information.