Merge "ApiQueryRevisions: Remove bogus query optimization"