Fix #21488 -- Remove new feature option.

See https://code.djangoproject.com/ticket/21488