Revert change where NULL config value wasn't handled as unset (#1489202)