-util.c doesn't belong into the lib (cherry picked from commit 6191f6dda62e43765d5f48...