serf: Hotfix for failing CPP sanity check