Moving back to original plan for elasticsearch