Revert "mServerQuery has been added"

This reverts commit 4b37d4683ea3c6e535cfe4d24b2e899e254e78bc.
Revert "Revert "mServerQuery has been added""

This reverts commit cc831b679272a0ab5f9c707b2ca28de994de180f.