Allow overriding machine-wide config options back to default

[bastianeicher]

Currently, when a config option is set to it's default value, the value is not persisted on disk. This works fine, unless a non-default value is set in the machine-wide config. Find a way to solve this.