This reverts commit b47d2e07e1. query is a feature for 2.5. We're not reverting it now. (cherry picked from commit 03a6d72633)
b47d2e07e1
03a6d72633