Merge "Remove problem forced index"