Prevent an indexing death spiral.

Change-Id: I86b20cd0830d02f87b2f020767257e2d3fb2033c