This reverts commit f09807ca9dda2f588298d8733e89a81105c88120, restoring bfe7205975a63a605ff3faacd97fe4c1bf4c19b3 and follow on fix e3e6bc699574550f2ed1de07f4e5bcdddaa65557, now that the nondeterminism has been addressed by D149924. Differential Revision: https://reviews.llvm.org/D141077