revert cavlRemove #381

Job	Run time
debug (clang)	3m 43s
debug (gcc)	3m 36s
avr	3m 8s
optimizations (clang, MinSizeRel)	3m 12s
optimizations (gcc, Release)	3m 17s
optimizations (clang, Release)	3m 2s
arm	3m 33s
optimizations (gcc, MinSizeRel)	3m 3s
sonarcloud	0s
style_check	13s
	26m 47s

Provide feedback