Back to >= dj 3.0.0