Change to mimic our current config