Revert empty value fix - seems not more necessary