Revert "Merge pull request #2175 from maggiolo00/custom-index"

This reverts commit 7f18e5bbe79b2799383eb7bd090646d7c3f5de8f, reversing
changes made to da73377f10c33879d51b7acadbfce0b0e7687750.