Rework config defaults