remove unnecessary changes due to the refactor in 6234 #1709

Job	Run time
Build min release artifacts on Linux x64	13m 28s
Build and Verify on (ciGroup1)	35m 23s
Build min release artifacts on Linux ARM64	13m 59s
Run plugin functional tests on Linux	16m 27s
Build and Verify on (ciGroup2)	21m 56s
Run plugin functional tests on Windows	22m 13s
Build and Verify on (ciGroup3)	23m 28s
Run functional tests on (ciGroup1)	18m 59s
Build and Verify on (ciGroup4)	26m 59s
Run functional tests on (ciGroup2)	30m 40s
Build and Verify on Linux (ciGroup)	51m 50s
Run functional tests on (ciGroup3)	37m 50s
Run functional tests on (ciGroup4)	36m 56s
Run functional tests on (ciGroup5)	27m 28s
Run functional tests on (ciGroup6)	14m 29s
Run functional tests on (ciGroup7)	27m 41s
Run functional tests on (ciGroup8)	28m 35s
Run functional tests on (ciGroup9)	24m 29s
Run functional tests on (ciGroup10)	29m 6s
Run functional tests on (ciGroup11)	37m 34s
Run functional tests on (ciGroup12)	45m 23s
Run functional tests on (ciGroup13)	16m 31s
Run functional tests on Linux (ciGroup)	9m 24s
Run backwards compatibility tests (osd-2.0.0)	1m 47s
Run backwards compatibility tests (osd-2.1.0)	1m 40s
Run backwards compatibility tests (osd-2.2.0)	1m 40s
Run backwards compatibility tests (osd-2.3.0)	1m 37s
Run backwards compatibility tests (osd-2.4.0)	1m 54s
Run backwards compatibility tests (osd-2.5.0)	1m 39s
Run backwards compatibility tests (osd-2.6.0)	1m 39s
Run backwards compatibility tests (osd-2.7.0)	1m 41s
Run backwards compatibility tests (osd-2.8.0)	1m 37s
Run backwards compatibility tests (osd-2.9.0)	1m 39s
	10h 27m 41s

Provide feedback