Marked query.* as .Deprecated internally #rm1669