unset instead of exporting empty variables, fix #3086