This reverts commit 6a268e7339. Reason for revert: Ic1252efe9f96743d9402fa31a7b2dca1f57ff6ae ended up not renaming the index, so this patch removed an index that was still in use. Change-Id: Ide4a600a57bcfa4da0c7354b972cc89709ccd660
6a268e7339