remove forced index causing full index scans

bug 57285

Change-Id: I2a41553c60de53b156fda01faa89af7bdd29d065