backout 0fb7789b5eeb for test breakage (#20578)