Revert "reduce count of CUtils compilation"

This reverts commit eb4b2a6a85687263842d4310bf0f49049aa6c3d3.

(to busy/lazy to fix atm)