This reverts commit 6fbf022908c104a380fd1854fb96eafc64509366, restoring commit bf6ff4fd4b735afffc65f92a4a79f6610e7174c3 with a fix for a bot failure due to a previously unstable iteration order. Differential Revision: https://reviews.llvm.org/D141077