Revert "ProductIndex"

This reverts commit fd380c1cdec06cca320c893aaf227e43ae4fd5a7.