Revereted to simpler configs for the time being