Revert a7c2fa0..593df7f

This rolls back to commit a7c2fa0eb1d8845d4a7a2e405ec0fb61a2c6e4d1.
Couple of small changes, and as far as I can tell, the index now matches my original prototype.