Done in https://github.com/chrismedrela/django/commit/9b16912b720d711754c5cc5baa09694037e6962a + small fixup in tests here https://github.com/chrismedrela/django/commit/9332a4f46bf2782fdb42cdf82e946a8a73884aa0#L0L198.