Another patch for config relocation