Back out on elkstack stuff for now