This reverts commit 0911f237737839dd90e77c93dd865756275aba69. The corresponding Clang change re-landed in 945c645acb9670b7b866a4abd94bcc9b0ae5d87d
This reverts commit 0911f237737839dd90e77c93dd865756275aba69. The corresponding Clang change re-landed in 945c645acb9670b7b866a4abd94bcc9b0ae5d87d