Reverting code changes - changing index fields resolved issue.

@bleen

With the index changes, I think we can revert some of these code changes.