remove unnecessary changes due to the refactor in #6234 #1710

Job	Run time
Build min release artifacts on Linux x64	13m 8s
Build and Verify on (ciGroup1)	39m 19s
Build min release artifacts on Linux ARM64	13m 6s
Build and Verify on (ciGroup2)	21m 10s
Run functional tests on (ciGroup1)	19m 7s
Build and Verify on (ciGroup3)	23m 12s
Run functional tests on (ciGroup2)	31m 56s
Build and Verify on (ciGroup4)	24m 22s
Run functional tests on (ciGroup3)	41m 47s
Build and Verify on Linux (ciGroup)	49m 54s
Run plugin functional tests on Linux	15m 38s
Run functional tests on (ciGroup4)	38m 21s
Run plugin functional tests on Windows	25m 35s
Run functional tests on (ciGroup5)	25m 33s
Run functional tests on (ciGroup6)	19m 47s
Run functional tests on (ciGroup7)	25m 29s
Run functional tests on (ciGroup8)	26m 17s
Run functional tests on (ciGroup9)	18m 4s
Run functional tests on (ciGroup10)	26m 31s
Run functional tests on (ciGroup11)	37m 28s
Run functional tests on (ciGroup12)	42m 15s
Run functional tests on (ciGroup13)	17m 39s
Run functional tests on Linux (ciGroup)	8m 47s
Run backwards compatibility tests (osd-2.0.0)	1m 36s
Run backwards compatibility tests (osd-2.1.0)	1m 37s
Run backwards compatibility tests (osd-2.2.0)	1m 40s
Run backwards compatibility tests (osd-2.3.0)	1m 50s
Run backwards compatibility tests (osd-2.4.0)	1m 38s
Run backwards compatibility tests (osd-2.5.0)	1m 38s
Run backwards compatibility tests (osd-2.6.0)	1m 40s
Run backwards compatibility tests (osd-2.7.0)	1m 41s
Run backwards compatibility tests (osd-2.8.0)	1m 40s
Run backwards compatibility tests (osd-2.9.0)	1m 52s
	10h 21m 17s

Provide feedback