2f8bca3 Tweak the default changes for CVE-2020-1938 so the patch applies cleanly

Authored and Committed by csutherl 4 years ago
    Tweak the default changes for CVE-2020-1938 so the patch applies cleanly