Revert "Merge pull request #9 from rfay/20131020_add_indexes"

This reverts commit 31068e6f4c5db81c13a4239cfa5d069fada323a6, reversing
changes made to e253c7307c749d69ad3abdb986f159b32eb6a5b1.