Re-implement change to Django 1.5.5.