Preparation to commit fix for #22217

Tweaks to https://github.com/django/django/pull/2402