Revert "SONAR-5905 Index Users in E/S"

This reverts commit 0dcc64de7a36c4709f8245955eea7685fc9bf169.