A bit more deboostification #1720

Job	Run time
build (windows-platform25)	5m 58s
build (windows-debug-platform25)	5m 12s
build (linux-platform25)	18m 25s
build (macos-arm64-platform25)	2m 6s
build (linux-debug-platform25)	19m 11s
build (linux-platform24)	19m 7s
	1h 9m 59s

Provide feedback