undo rebase damage; redo the Elasticsearch change