Reverted changes to Query.  The functionality cannot be split due to legacy mapping.

USERGRID-1906