Still doesn't work with QuerySets - need to backport https://github.com/django/django/commit/31fadc120213284da76801cc7bc56e9f32d7281b