Remove problem forced index

bug: 58256
Change-Id: I48484b39f99d92f51e531324870236b00b481553
Merge "Remove problem forced index"