This reverts commit 12d4769cb84b2b2e60f9776fa043c6ea16f08ebb, reapplying 524a028f69cdf25503912c396ebda7ebf0065ed2 but with fixes for failures seen in broader testing.
This reverts commit 12d4769cb84b2b2e60f9776fa043c6ea16f08ebb, reapplying 524a028f69cdf25503912c396ebda7ebf0065ed2 but with fixes for failures seen in broader testing.