Undo QueryIterable refactor