This NFC change was reverted as part of 880fa7fa, but the change is really good regardless of the associated Clang patch.