Move the "set empty value" logic to the driver level (fixes #6550, #6544)