Why don't I rollback the index change and just open another PR once it's done.