Rolling back ELK work

Rolling back the ELK work in favor of @masteinhauser's new approach.