The refactor in 3f76d140 fixed the creation
of redundant indexes.

Forwardport of 82ce55db from stable/1.10.x