This reverts commit c122b972 but fixes tests that were added between submitting #69329 for review and landing it for the first time.