[24.1] Fix bad merge conflict resolution #30836

Job	Run time
build-client / build-client	9m 17s
setup-selenium / setup_chromedriver	6s
Test (3.8, 0)	40m 18s
Test (3.8, 1)	49m 59s
Test (3.8, 2)	45m 3s
	2h 24m 43s

Provide feedback