Yup, moved to the query module.