Remove terrible FORCE INDEX that causes query timeouts

Change-Id: I383bf000fdc9ab7b283d01e3d155de577efe9ef6
Merge "Remove terrible FORCE INDEX that causes query timeouts"