Revert "Index message"

This reverts commit aa38dec1b674f4581b4f639b921dae316dca6dfa.