Revert cedc647..4dd18f8

This rolls back to commit cedc64718beffb0d45ce9e6e604745f503ea6128.
New index(cn).