Many thanks to @thakis for pointing this out. That commit should have been a part of https://reviews.llvm.org/D107049
d3205bbca3