Default value field shown even if module specifies to use NONE/CUSTOM default value

Karen and I talked through how to disable the default value field provided by CCK. After some investigation, we found that there's just an IF statement missing before showing the default field form. It looks like this same check is done during validation and submission, but not when the form is actually shown.