Now that we only have one file with condition implementations around, we can drop the -util suffix and simplify things a bit.
Lennart Poettering