Trunk Clang as of this writing leaves an error, but this looks like
it should have been fixed by reverts, no?
error: declaration conflicts with target of using declaration already in
Sadly unrelated to recent reverts. This has been broken since May 17, 2019. Differential D62046.