back out r101364, as it trips the linux nightlybot on some clang C++ tests