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

Job	Run time
Build and Verify on (ciGroup1)	37m 32s
Build and Verify on (ciGroup2)	22m 31s
Run functional tests on (ciGroup1)	20m 38s
Build and Verify on (ciGroup3)	23m 34s
Run functional tests on (ciGroup2)	30m 39s
Build and Verify on (ciGroup4)	22m 30s
Run functional tests on (ciGroup3)	41m 29s
Build and Verify on Linux (ciGroup)	50m 41s
Run functional tests on (ciGroup4)	40m 20s
Run functional tests on (ciGroup5)	24m 58s
Run functional tests on (ciGroup6)	20m 53s
Run plugin functional tests on Linux	16m 13s
Run functional tests on (ciGroup7)	29m 58s
Build min release artifacts on Linux x64	13m 3s
Run plugin functional tests on Windows	23m 29s
Run functional tests on (ciGroup8)	28m 25s
Run functional tests on (ciGroup9)	24m 56s
Build min release artifacts on Linux ARM64	13m 3s
Run functional tests on (ciGroup10)	29m 53s
Run functional tests on (ciGroup11)	37m 49s
Run functional tests on (ciGroup12)	43m 27s
Run functional tests on (ciGroup13)	19m 12s
Run functional tests on Linux (ciGroup)	8m 39s
Run backwards compatibility tests (osd-2.0.0)	1m 41s
Run backwards compatibility tests (osd-2.1.0)	1m 47s
Run backwards compatibility tests (osd-2.2.0)	3m 12s
Run backwards compatibility tests (osd-2.3.0)	1m 41s
Run backwards compatibility tests (osd-2.4.0)	1m 39s
Run backwards compatibility tests (osd-2.5.0)	1m 40s
Run backwards compatibility tests (osd-2.6.0)	1m 39s
Run backwards compatibility tests (osd-2.7.0)	1m 37s
Run backwards compatibility tests (osd-2.8.0)	1m 39s
Run backwards compatibility tests (osd-2.9.0)	2m 8s
	10h 42m 35s

Provide feedback