Revert "index principal"

This reverts commit 019be44b08e02dfa82e5b5839a83b54d1b3e5184.
Revert "Revert "index principal""

This reverts commit 844d9ea8229c86a6c3e5d403efdd3ff254268b90.