Putting a workaround in place for https://code.djangoproject.com/ticket/19422, which won't be fixed, apparently.