This reverts commit 9cf9c796be due to a crash on Oracle as it didn't allow multiple indexes on the same field.
9cf9c796be