remove 1285908 query

this is hitting more success than failure, and I think largely
masking real issues that need to be solved.

Change-Id: Ia3ff13324d3cb38ff7b8324ab46bfc9646081f0c
Related-Bug: #1285908
Merge "remove 1285908 query"