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