Revert "Start chaning query alter."

This reverts commit 8f10892b8c8a4ea5c79d47497cd9f97a005de482.