Add a temporary patch for https://code.djangoproject.com/ticket/16955.