Fixup of #371

Fixup of https://github.com/cfengine/masterfiles/pull/371