Revert "Merging edit_index with master before things get out of hand.."

This reverts commit 0bfc417d9f405e60465673968808abf85883327d, reversing
changes made to c7cb3e6690c8f0d5ab540e0bf255f9267c3b2191.

Kathleen haphazardly merged this and didn't attempt to fix changes
properly.