Let config save actually save the config
Stop using with() compat function