This way they won't need to fix things again when get_query_set disappears Backport of 91e2780d from master